summaryrefslogtreecommitdiffstats
path: root/camera/OMXCameraAdapter
Commit message (Collapse)AuthorAgeFilesLines
* am 8a2c7a2d: am 8eedae16: am 50f5c8a3: CameraHal: WA for green thumbnail for ↵Tyler Luu2011-11-101-1/+5
|\ | | | | | | | | | | | | video snapshot * commit '8a2c7a2d44408aea33beef1775c7b925211d1aae': CameraHal: WA for green thumbnail for video snapshot
| * CameraHal: WA for green thumbnail for video snapshotTyler Luu2011-11-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | WA for regression introduced with: 'cf0a61f135: CameraHAL: Use Ancillary data to check for snapshot" Video snapshot postview frames are not currently being tagged with the ancillary data. Let this check pass through when in video mode. Change-Id: I9b3aacb902d15f1cd7f993f6664976299fcb0427 Signed-off-by: Tyler Luu <tluu@ti.com>
* | am fef08387: am 7e51020e: am f9df3ee5: CameraHAL: Clear events queue fix, ↵Sundar Raman2011-11-101-3/+13
|\ \ | |/ | | | | | | | | | | clear command queue on exit * commit 'fef083876a27ebab9451c0151ce6fbaae0f66ccf': CameraHAL: Clear events queue fix, clear command queue on exit
| * CameraHAL: Clear events queue fix, clear command queue on exitSundar Raman2011-11-101-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 2/3 for b/5593964. 1. The events queue wasn't being cleared correctly inside OMXCameraAdapter as some items were being removed while the index was being formulated based on the original size 2. The command queue should be cleared before posting the EXIT message for the OMX adapter threads so as not to process those messages since we are exiting Change-Id: I0a5eaceb3d1504fee05b064ebb5fe888e129ad44 Signed-off-by: Sundar Raman <sunds@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* | am d3278ddd: am 977fc7e4: am 3ec18006: CameraHAL: Fixes for ANR and a ↵Sundar Raman2011-11-102-14/+12
|\ \ | |/ | | | | | | | | | | setParameter issue * commit 'd3278ddd57085e8d7f261defbdfaed4d5bbea167': CameraHAL: Fixes for ANR and a setParameter issue
| * CameraHAL: Fixes for ANR and a setParameter issueSundar Raman2011-11-102-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 1/3 for b/5593964. 1. Ensure we don't race with stopImageCapture when stopPreview is called 2. Signal the shutter callback correctly 3. Do not crash the media server if focus APIs and image capture returns error Still go ahead and perform de-init 4. Replace setParameter from CameraHAl to AppCallbackNotifier with getParameter when needed. Change-Id: I2b2745827d227a8d7927ce1611a84c29129e8891 Signed-off-by: Sundar Raman <sunds@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* | am c087cd70: am 69077c25: am 2136042f: CameraHAL: Setting focus mode ↵Milen Mitkov2011-11-102-6/+38
|\ \ | |/ | | | | | | | | | | shouldnt start focus scanning * commit 'c087cd70cfa6dcbcdbafaa5f85a48a585263068c': CameraHAL: Setting focus mode shouldnt start focus scanning
| * CameraHAL: Setting focus mode shouldnt start focus scanningMilen Mitkov2011-11-092-6/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of the fix for b/5591797. Use the new index OMX_TI_IndexAutofocusEnable to control the AF algorithm when it should start scanning. Until now, setting the focus to almost any mode caused (unwanted) scanning. Also, "Infinity" focus should actually have the ability to perform scanning. Change-Id: Iaa0f46a17d63acdd8f43b4b2b011f68fc7506165 Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* | am a7c06115: am efa626c4: am 956c27e3: CameraHal: Apply3aSettings at start ↵Vladislav Hristov2011-11-101-0/+1
|\ \ | |/ | | | | | | | | | | preview * commit 'a7c06115a023e4160d2ef922fc0930098642293c': CameraHal: Apply3aSettings at start preview
| * CameraHal: Apply3aSettings at start previewVladislav Hristov2011-11-091-0/+1
| | | | | | | | | | | | | | | | Fixes b/5515136. Change-Id: I3b462b337f42be7ebe07642f5298f45bb1431daa Signed-off-by: Vladislav Hristov <vhristov@mm-sol.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* | am 3c86a542: am fe3c9139: CameraHal: Wait for frame before stopping previewTyler Luu2011-11-071-0/+14
|\ \ | |/ | | | | | | * commit '3c86a5424fa4a0099d66172ff8b0a00eda9fd528': CameraHal: Wait for frame before stopping preview
| * CameraHal: Wait for frame before stopping previewTyler Luu2011-11-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | Fix 3/3 for b/5472396. We should wait for the first frame to come before trying to stopPreview. If not, we might put OMXCamera in a bad state i.e (IDLE->LOADED timeout). Seeing this a lot after a capture Change-Id: I4ac6cc4f12bdc0d4d73e065b7c53caf8a440a43c Signed-off-by: Tyler Luu <tluu@ti.com>
* | am 2a7d690c: am fc8ab094: CameraHal: Clean-up if mCaptureSem times outTyler Luu2011-11-071-11/+1
|\ \ | |/ | | | | | | * commit '2a7d690c1acd0f61fbd95a532c9703a4cd0af83a': CameraHal: Clean-up if mCaptureSem times out
| * CameraHal: Clean-up if mCaptureSem times outTyler Luu2011-11-071-11/+1
| | | | | | | | | | | | | | | | | | | | Fix 2/3 for b/5472396. In stopImageCapture, continue cleaning up even if mCaptureSem times out. Change-Id: Idf65a488b2ce55a9d451a899df0bc76f6480647b Signed-off-by: Tyler Luu <tluu@ti.com>
* | am dfffc837: am d9949c1e: CameraHal: Add 2592x1728 and 2592x1458 image ↵Gilles-Arnaud Bleu-Laine2011-11-051-0/+2
|\ \ | |/ | | | | | | | | | | capture resolutions * commit 'dfffc83746802d0c582772976103403ec5c58059': CameraHal: Add 2592x1728 and 2592x1458 image capture resolutions
| * CameraHal: Add 2592x1728 and 2592x1458 image capture resolutionsGilles-Arnaud Bleu-Laine2011-11-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of the fix for b/5546023 Adding new resolution to support 16:9 and 3:2 aspect ratio. Note: This allows to keep same aspect ratio between video preview and video snapshot. This change requires a matching Ducati update. For the power savings to take effect, the new resolution must actually be used by the application. Change-Id: I87d5f3155856b0c2c83763349843628eeadfacfc Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* | am eb3ed8e7: am 3c272a99: CameraHAL: Return status after CAF finishesMilen Mitkov2011-11-022-25/+19
|\ \ | |/ | | | | | | * commit 'eb3ed8e75abbe8785b86a47851f4d7e98300006c': CameraHAL: Return status after CAF finishes
| * CameraHAL: Return status after CAF finishesMilen Mitkov2011-10-312-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | If the user initiates autofocus while CAF is scanning (e.g. when capturing), wait until CAF finishes and just then notify the focus subscribers. bug:5514415 Change-Id: I971783c74f9977755cc93cdba964e4fcd3a2ab0a Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
* | am 9b4a3604: am cf0a61f1: CameraHAL: Use Ancillary data to check for snapshotMilen Mitkov2011-11-022-4/+57
|\ \ | |/ | | | | | | * commit '9b4a3604f53dbd3f41ee380fa1a041834490b688': CameraHAL: Use Ancillary data to check for snapshot
| * CameraHAL: Use Ancillary data to check for snapshotMilen Mitkov2011-10-312-4/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | Uses the ancilary data field nDCCStatus to check if the preview frame is a snapshot. Fixes a rare issue in which a normal (non-snapshot) preview frame is received after capture has started. Change-Id: I242c17ee3dd1365eb24c6c15585bb125f6938dee Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com> related-to-bug: 5472396
* | am 0f2338c5: am 39ad5f81: CameraHal: Limit 1080p framerate maxTyler Luu2011-10-312-0/+9
|\ \ | |/ | | | | | | * commit '0f2338c555446e851e6290882db06a5418257a96': CameraHal: Limit 1080p framerate max
| * CameraHal: Limit 1080p framerate maxTyler Luu2011-10-282-0/+9
| | | | | | | | | | | | | | Change-Id: Ic02b60940f80d309f9a87b6e1307fbbdd0c592ff Signed-off-by: Tyler Luu <tluu@ti.com> related-to-bug: 5508276
* | am 6a2252f8: am 030e1a59: CameraHal: Check state in doAutoFocusTyler Luu2011-10-281-0/+5
|\ \ | |/ | | | | | | * commit '6a2252f8068c876dc81a5da706fc365183a5c159': CameraHal: Check state in doAutoFocus
| * CameraHal: Check state in doAutoFocusTyler Luu2011-10-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the state in doAutoFocus and return if we are not in the AF_STATE. If user/monkey is pressing all over the screen, this will result in multiple autoFocus/cancelAutoFocus calls until the last autoFocus call comes when the user/monkey stop pressing preview window. This will result in multiple CAMERA_PERFORM_AUTOFOCUS commands being queued in OMXCameraAdapter's CommandHandler that will all eventually need to be serviced which will result in multiple doAutoFocus calls. This is the reason why we need to check the state in the beginning of the function and return if we are not focusing. Change-Id: If245751a296604bca511ad237b769be24175cbc6 Signed-off-by: Tyler Luu <tluu@ti.com> related-to-bug: 5472396
* | am 2a791c57: am 7cc8a8f7: Merge "Remove non-(calibrated, api, or verified) ↵James Dong2011-10-271-8/+0
|\ \ | |/ | | | | | | | | | | 3A settings" into ics-mr0 * commit '2a791c57349ab4fa956226c2b3d0cbaa06973fc7': Remove non-(calibrated, api, or verified) 3A settings
| * Merge "Remove non-(calibrated, api, or verified) 3A settings" into ics-mr0James Dong2011-10-271-8/+0
| |\
| | * Remove non-(calibrated, api, or verified) 3A settingsTyler Luu2011-10-271-8/+0
| | | | | | | | | | | | | | | | | | | | | 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-264-22/+84
|\ \ | |/ | | | | | | * commit 'df6023f6fd9a515da9cec0e98ea303306b14c5d8': CameraHal: Fixes for #testFocusDistance
| * CameraHal: Fixes for #testFocusDistanceTyler Luu2011-10-264-22/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * 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-251-1/+1
| |/ |/| | | | | | | | | | | 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: 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-202-0/+42
| | | | | | | | | | 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: Fix for #testJpegExifSundar Raman2011-10-193-2/+17
| | | | | | | | | | | 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-192-36/+80
| | | | | | | | | | | | | | | | | | | | 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-191-9/+6
| | | | | | | | | | | | | | | 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-191-1/+6
| | | | | | | | | | | | | 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-191-0/+9
| | | | | | | | | | | | | 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>