summaryrefslogtreecommitdiff
path: root/camera
AgeCommit message (Collapse)Author
2011-11-22CameraHal: Add more Exif data for video snapshotTyler Luu
Fixes b/5582076. Requires changes to Ducati and external/jhead. 1. Add API to get and set ancillary data metadata so we can use the values to fill in Exif data. 2. Add support for additional tags. Change-Id: I537e683839c59e92a4a20ff62653b6d46e303f53 Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-11-18am 089c480c: am d31eec66: am 0bb54549: Ignore camera.flash_off system ↵James Dong
property for user build * commit '089c480c4e657653673854f0e3d92faa0fec75a5': Ignore camera.flash_off system property for user build
2011-11-18am 0bb54549: Ignore camera.flash_off system property for user buildJames Dong
* commit '0bb5454945320db77ff426baf9c0c34631c373ab': Ignore camera.flash_off system property for user build
2011-11-17Ignore camera.flash_off system property for user buildandroid-sdk-adt_r16.0.1android-cts-4.0_r1ics-mr0James Dong
This system property is meant for testing only and should be ignored for user build. Change-Id: I553b68d62f41012766d7d208451a178a733d151e related-to-bug: 5617451
2011-11-17am 8d18af6d: am e4639448: CameraHAL: clean up logsIliyan Malchev
* commit '8d18af6dfd68f047c2bcf82fe88eeeb623eafa0c': CameraHAL: clean up logs
2011-11-17am 205f5527: am 78dac813: CameraHAL: Do not return error if AF failsIliyan Malchev
* commit '205f5527e88ea9b108e3d84050a43e310632b0e3': CameraHAL: Do not return error if AF fails
2011-11-17CameraHAL: clean up logsIliyan Malchev
-- introduce CAMHAL_LOGI so that we don't have to dump informational messages as LOGE -- convert some verbose messages to CAMHAL_LOGDB -- convert most frequent non-error log messages to CAMHAL_LOGI Change-Id: I8afc24aa17da2c157b7b37300a79b4cde81f87e5 Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-11-17CameraHAL: Do not return error if AF failsIliyan Malchev
Fixes b/5612881 Some third-party apps do not handle errors thrown by the camera HAL when they try to invoke autoFocus while AF is in progress. The Barcode Scanner, in particular, will quit in this case without releasing the Camera handle, wreaking all sorts of power-management havoc. Even though CTS does not mandate it, previous versions of Android and other camera HAL implementations simply return success in this case. This patch makes this HAL conform to this behavior. Change-Id: I758e2de7f84b61043267f052169068b64d75d0d1 Signed-off-by: Sundar Raman <sunds@ti.com>
2011-11-17am b5375cf2: am 05ea07df: CameraHal: Use Different Timeout for Video ModeTyler Luu
* commit 'b5375cf2e7f917556b377be4ec0974f7c62dbe0d': CameraHal: Use Different Timeout for Video Mode
2011-11-16CameraHal: Use Different Timeout for Video ModeTyler Luu
Select AF timeout based on whether or not we are in video mode. b/5492725 Change-Id: I2fa722e6a3a7c149488ddb29ce44262914d19e38 Signed-off-by: Tyler Luu <tluu@ti.com>
2011-11-16am 499aad98: am 53613f8e: am 6014a8f2: When camera.flash_off is 1, disable ↵James Dong
camera flash. This is for testing purpose only * commit '499aad98956ba1ab16c6bc6540cd19ee1bad189e': When camera.flash_off is 1, disable camera flash. This is for testing purpose only
2011-11-15When camera.flash_off is 1, disable camera flash.James Dong
This is for testing purpose only Change-Id: Idf0a6d5d52daeb4b5ff7576d0119868bdeff40eb related-to-bug: 5617451
2011-11-11am bf97da4d: am a3be7d18: am cb1183d6: videosnapshot memory corruption fixes.Akwasi Boateng
* commit 'bf97da4dfacdb7d8a5555d6aef166d782f6d0e05': videosnapshot memory corruption fixes.
2011-11-11am c24cc17f: am eb1fc89d: Revert "CameraHAL: Fix preview not starting after ↵James Dong
surface is abdandoned" * commit 'c24cc17f3b7483bd0ff31546eae223943bdaf595': Revert "CameraHAL: Fix preview not starting after surface is abdandoned"
2011-11-11Revert "CameraHAL: Fix preview not starting after surface is abdandoned"James Dong
This reverts commit cbaa66464ff86bddf40e3c8de8db44473ff27de9. we need to revert this change since this leads to a stop ship problem where we can only take a single picture.
2011-11-11videosnapshot memory corruption fixes.Akwasi Boateng
1. Fixes memory corruption of dst buffer in nv21_to_yuv() convertion 2. Free malloced row_tmp buffer 3. Free params string in Appcallback Change-Id: I2179f1158f6e72cca0f7e5c815b1cb576bfa925e Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com> related-to-bug: 5601247
2011-11-10Revert "CameraHAL: Fix preview not starting after surface is abdandoned"James Dong
This reverts commit cbaa66464ff86bddf40e3c8de8db44473ff27de9. we need to revert this change since this leads to a stop ship problem where we can only take a single picture.
2011-11-10am 8a2c7a2d: am 8eedae16: am 50f5c8a3: CameraHal: WA for green thumbnail for ↵Tyler Luu
video snapshot * commit '8a2c7a2d44408aea33beef1775c7b925211d1aae': CameraHal: WA for green thumbnail for video snapshot
2011-11-10am 334dd8a9: am c5831812: am cbaa6646: CameraHAL: Fix preview not starting ↵Tyler Luu
after surface is abdandoned * commit '334dd8a961fcfe53c083b2b8a0e7041065704a7d': CameraHAL: Fix preview not starting after surface is abdandoned
2011-11-10am fef08387: am 7e51020e: am f9df3ee5: CameraHAL: Clear events queue fix, ↵Sundar Raman
clear command queue on exit * commit 'fef083876a27ebab9451c0151ce6fbaae0f66ccf': CameraHAL: Clear events queue fix, clear command queue on exit
2011-11-10am d3278ddd: am 977fc7e4: am 3ec18006: CameraHAL: Fixes for ANR and a ↵Sundar Raman
setParameter issue * commit 'd3278ddd57085e8d7f261defbdfaed4d5bbea167': CameraHAL: Fixes for ANR and a setParameter issue
2011-11-10CameraHal: WA for green thumbnail for video snapshotTyler Luu
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>
2011-11-10CameraHAL: Fix preview not starting after surface is abdandonedTyler Luu
Fix 3/3 for b/5593964. (I'm bundling this fix with b/5573610 because it is preview-related, though strictly speaking not part of b/b/5573610. It has been with us since the beginning.) If an application gets backgrounded (HOME key) without stopping preview and releasing camera, preview would previously not restart when application is resumed. ANativeWindowDisplayAdapter would detect that the preview surface was abandoned and stop sending buffers to CameraAdapter. We were previously not doing anything when CameraService called setPreviewWindow when a display adapter was already created. To fix this issue, we need to send the preview window and restart preview. Change-Id: I36089b0046f9861897d32c50b52128a41e2de2a5 Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-11-10CameraHAL: Clear events queue fix, clear command queue on exitSundar Raman
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>
2011-11-10CameraHAL: Fixes for ANR and a setParameter issueSundar Raman
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>
2011-11-10am c087cd70: am 69077c25: am 2136042f: CameraHAL: Setting focus mode ↵Milen Mitkov
shouldnt start focus scanning * commit 'c087cd70cfa6dcbcdbafaa5f85a48a585263068c': CameraHAL: Setting focus mode shouldnt start focus scanning
2011-11-10am a7c06115: am efa626c4: am 956c27e3: CameraHal: Apply3aSettings at start ↵Vladislav Hristov
preview * commit 'a7c06115a023e4160d2ef922fc0930098642293c': CameraHal: Apply3aSettings at start preview
2011-11-09CameraHAL: Setting focus mode shouldnt start focus scanningMilen Mitkov
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>
2011-11-09CameraHal: Apply3aSettings at start previewVladislav Hristov
Fixes b/5515136. Change-Id: I3b462b337f42be7ebe07642f5298f45bb1431daa Signed-off-by: Vladislav Hristov <vhristov@mm-sol.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-11-07am 3c86a542: am fe3c9139: CameraHal: Wait for frame before stopping previewTyler Luu
* commit '3c86a5424fa4a0099d66172ff8b0a00eda9fd528': CameraHal: Wait for frame before stopping preview
2011-11-07am 2a7d690c: am fc8ab094: CameraHal: Clean-up if mCaptureSem times outTyler Luu
* commit '2a7d690c1acd0f61fbd95a532c9703a4cd0af83a': CameraHal: Clean-up if mCaptureSem times out
2011-11-07am 5184e1e1: am a58c483d: CameraHal: Add function to rollback state machineTyler Luu
* commit '5184e1e128919716e8090d02a7abffa97cb74af0': CameraHal: Add function to rollback state machine
2011-11-07CameraHal: Wait for frame before stopping previewTyler Luu
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>
2011-11-07CameraHal: Clean-up if mCaptureSem times outTyler Luu
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>
2011-11-07CameraHal: Add function to rollback state machineTyler Luu
Fix 1/3 for b/5472396. Adding a function to rollback the state machine to INTITIALIZED_STATE from any given current state. With this function, we can better manage the different states that CameraAdapter could be in when stopPreview is called. Change-Id: I0a456738e8575873b5ac6fb2a31395dab54ef6f7 Signed-off-by: Tyler Luu <tluu@ti.com>
2011-11-05am dfffc837: am d9949c1e: CameraHal: Add 2592x1728 and 2592x1458 image ↵Gilles-Arnaud Bleu-Laine
capture resolutions * commit 'dfffc83746802d0c582772976103403ec5c58059': CameraHal: Add 2592x1728 and 2592x1458 image capture resolutions
2011-11-02CameraHal: Add 2592x1728 and 2592x1458 image capture resolutionsGilles-Arnaud Bleu-Laine
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>
2011-11-02am eb3ed8e7: am 3c272a99: CameraHAL: Return status after CAF finishesMilen Mitkov
* commit 'eb3ed8e75abbe8785b86a47851f4d7e98300006c': CameraHAL: Return status after CAF finishes
2011-11-02am 9b4a3604: am cf0a61f1: CameraHAL: Use Ancillary data to check for snapshotMilen Mitkov
* commit '9b4a3604f53dbd3f41ee380fa1a041834490b688': CameraHAL: Use Ancillary data to check for snapshot
2011-10-31CameraHAL: Return status after CAF finishesMilen Mitkov
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>
2011-10-31CameraHAL: Use Ancillary data to check for snapshotMilen Mitkov
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
2011-10-31am 0f2338c5: am 39ad5f81: CameraHal: Limit 1080p framerate maxTyler Luu
* commit '0f2338c555446e851e6290882db06a5418257a96': CameraHal: Limit 1080p framerate max
2011-10-28CameraHal: Limit 1080p framerate maxTyler Luu
Change-Id: Ic02b60940f80d309f9a87b6e1307fbbdd0c592ff Signed-off-by: Tyler Luu <tluu@ti.com> related-to-bug: 5508276
2011-10-28am 6a2252f8: am 030e1a59: CameraHal: Check state in doAutoFocusTyler Luu
* commit '6a2252f8068c876dc81a5da706fc365183a5c159': CameraHal: Check state in doAutoFocus
2011-10-27am 2a791c57: am 7cc8a8f7: Merge "Remove non-(calibrated, api, or verified) ↵James Dong
3A settings" into ics-mr0 * commit '2a791c57349ab4fa956226c2b3d0cbaa06973fc7': Remove non-(calibrated, api, or verified) 3A settings
2011-10-27am 9298f71c: am b1922897: Only return error for Invalid stateAkwasi Boateng
* commit '9298f71ce8c46d14f7638ba80560107a5bbfa8ca': Only return error for Invalid state
2011-10-27CameraHal: Check state in doAutoFocusTyler Luu
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
2011-10-27Merge "Remove non-(calibrated, api, or verified) 3A settings" into ics-mr0James Dong
2011-10-27Remove non-(calibrated, api, or verified) 3A settingsTyler Luu
Change-Id: I16aaafeb43a0799cf12d97979709524e3b0fc933 Signed-off-by: Tyler Luu <tluu@ti.com> related-to-bug: 5472533
2011-10-27Only return error for Invalid stateAkwasi Boateng
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