summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/api1
Commit message (Collapse)AuthorAgeFilesLines
...
| * camera: add latest parameters to dumpsys for api1 camerasIgor Murashkin2014-09-112-0/+14
| | | | | | | | | | Bug: 17290106 Change-Id: I08ac1659d0367613c37669d5bf6e6bf7b2b63bc2
* | Merge "Camera2: improve ZSL candidate selection logic" into lmp-devYin-Chia Yeh2014-09-123-2/+38
|\ \
| * | Camera2: improve ZSL candidate selection logicYin-Chia Yeh2014-09-113-2/+38
| |/ | | | | | | | | | | | | | | | | 1. Clear ZSL queue when focus mode is changed and autoFocus is cancelled. 2. Do not check focus state is focus mode is fixed. Bug: 17185356 Change-Id: I2cb10fb457b080f0db950c894e56995f638e147b
* | Merge "camera2: skip capture result after clearZslQueue" into lmp-devYin-Chia Yeh2014-09-122-2/+6
|\ \ | |/ |/|
| * camera2: skip capture result after clearZslQueueYin-Chia Yeh2014-09-112-2/+6
| | | | | | | | | | | | | | | | After ZSL queue is cleared, don't add capture result to ZSL queue if its corresponding buffer has been cleared. Bug: 17185356 Change-Id: Iddac39ab09b2560e2ce9390895927217c1736d5a
* | Merge "camera2: Fix video snapshot for HAL 2.* devices." into lmp-devRuben Brunk2014-09-105-2/+52
|\ \ | |/ |/|
| * camera2: Fix video snapshot for HAL 2.* devices.Ruben Brunk2014-09-095-2/+52
| | | | | | | | | | | | | | | | | | | | | | Bug: 15408128 - Lazily destroy ZSL stream when ZslProcessor is updated, or when the camera client is disconnected, allowing HAL 2.* devices that rely on the ZSL stream to capture video snapshots to function correctly. Change-Id: Ia5cf14c62acda4d9c640440dc5b8e0796dc0b3fa
* | Merge "Camera2: reconfigure video snapshot size if needed" into lmp-devYin-Chia Yeh2014-09-083-2/+84
|\ \
| * | Camera2: reconfigure video snapshot size if neededYin-Chia Yeh2014-09-083-2/+84
| | | | | | | | | | | | | | | | | | | | | | | | When recording fails to start due to stream configuration failed, try configure stream again by setting jpeg stream to video size. Bug: 16162133 Change-Id: Ib20271e787ae07719ce419f0b15c7f86434f7ebb
* | | Merge "Camera API1: fix AE state check in precapture state" into lmp-devZhijun He2014-09-051-5/+12
|\ \ \ | |_|/ |/| |
| * | Camera API1: fix AE state check in precapture stateZhijun He2014-09-031-5/+12
| |/ | | | | | | | | | | | | It is legal to transit to CONVERGED or FLASH_REQUIRED after a AE precapture trigger. Bug: 17365185 Change-Id: Id041eff5eac564c32d09b547a0139d24807336f4
* | Merge "camera1: Ensure MemoryHeap buffers are mmapped before copying." into ↵Ruben Brunk2014-09-021-1/+14
|\ \ | |/ |/| | | lmp-dev
| * camera1: Ensure MemoryHeap buffers are mmapped before copying.Ruben Brunk2014-08-291-1/+14
| | | | | | | | | | Bug: 16986293 Change-Id: Icb68254d7ed1812fa9e60342749a2746d6fcfb17
* | Merge "cameraservice: decrease zsl metadata queue size by 1" into lmp-devYin-Chia Yeh2014-08-271-2/+6
|\ \
| * | cameraservice: decrease zsl metadata queue size by 1Yin-Chia Yeh2014-08-271-2/+6
| |/ | | | | | | | | | | | | | | | | | | | | Zsl buffer needs to be longer than metadata queue to ensure that oldest metadata can always find a match in buffer queue. Since we don't want to add memory overhead, decrease metadata queue size by one serves the same purpose. bug 17264283 Change-Id: Ic53441cc29c98e57d3345f5845d92839d0ce6faf
* | Camera API1: Fix ZSLProcessor3 deadlockZhijun He2014-08-271-1/+3
|/ | | | | | | | | | | ZSLProcessor3 shouldn't acquire mInputMutex in onBufferReleased call for output buffers, because the caller (Camera3Stream::returnBuffer) holds the camera3 stream lock already. This could cause deadlock for ZSL reprocess request as it holds the ZSLProcessor3 input lock and try to acquire camera3 stream lock to submit the request. Bug: 17299038 Change-Id: I6a7bf8ebd7c2064852358c655f3a3e9a67769213
* Merge "camera: zsl: remove AF check if no focser presents" into lmp-devYin-Chia Yeh2014-08-212-15/+26
|\
| * camera: zsl: remove AF check if no focser presentsYin-Chia Yeh2014-08-212-15/+26
| | | | | | | | | | | | | | | | | | If there is no focuser, don't check AF state while picking ZSL candidate frames. bug 17164077 Change-Id: Ib56e260249dcfb1b3bafea22abeb3abeae4e2c1a
* | camera: Allow shutter sounds to be disabled from camera2 apiIgor Murashkin2014-08-194-4/+26
|/ | | | | | | | | | | When using the connectLegacy binder interface (available only through an @hide java api), then consider the camera to be in the camera2 api legacy mode. In legacy mode, allow disabling the shutter sound unconditionally. Bug: 17109582 Change-Id: Ieb3fc61ff111d792cc657c018e278349c25472cf
* Merge "cameraservice: update supportedFocusModes for api1" into lmp-devYin-Chia Yeh2014-08-191-2/+11
|\
| * cameraservice: update supportedFocusModes for api1Yin-Chia Yeh2014-08-141-2/+11
| | | | | | | | | | | | | | | | Do not list infinity focus mode if the focuser is not calibrated. bug 13933979 Change-Id: I677ed22305703ac09eeaf986f5bc2a680cececd8
* | camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-08-182-44/+121
|/ | | | | | | | | | | | | As a workaround, duplicate CameraParameters into CameraParameters2 to prevent ABI break for some camera HALs that directly link into CameraParameters. CameraParameters2 implements the real fixes needed in the framework, while CameraParameters is left in to satisfy older camera HALs. Bug: 12609188 Bug: 16654949 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
* Merge "Camera API1: Ignore the video size change during recording" into lmp-devZhijun He2014-08-121-14/+19
|\
| * Camera API1: Ignore the video size change during recordingZhijun He2014-08-111-14/+19
| | | | | | | | | | | | | | Ignore the video size parameter change when recording is active. Bug: 16524513 Change-Id: I55b7c961c06199764486f48bc2187838c2279606
* | Merge "camera: Allow Camera#getParameters to be called by mediaserver ↵Igor Murashkin2014-08-112-2/+4
|\ \ | | | | | | | | | anytime" into lmp-dev
| * | camera: Allow Camera#getParameters to be called by mediaserver anytimeIgor Murashkin2014-08-072-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a crash if the camera was locked by the media recorder and another process tried to get the legacy parameters (for the camera characteristics). Bug: 16695955 Change-Id: I945a16a686a6987150c8754b5296353e76e5afa0
* | | Camera2/3: Cleanup the jpeg buffer size calcaulation logicZhijun He2014-08-114-15/+10
| |/ |/| | | | | | | | | | | | | | | - Only one place calculating the jpeg size-the device layer, Camera2Device and Camera3Device. - Remove size argument for CameraDeviceBase and cleanup related code. Bug: 14327010 Change-Id: I45d2ab4859ee0cc9273e579254f0569108c748f1
* | Camera: Need consider AF state for ZSL buffer selectionZhijun He2014-08-061-0/+16
|/ | | | | Bug: 16569983 Change-Id: I65e604e382ac0b98777155ad480ec3f6071e1a76
* cameraservice: disallow zsl/recording coexistentceYin-Chia Yeh2014-08-051-1/+33
| | | | | | | Make sure ZSL and recording stream does not exist at the same time. Change-Id: I19e28dedd9dd5cc5118449860b612a5c950fdaec
* Camera3: tear down Camera3 streams when they are deleted.Zhijun He2014-07-241-1/+0
| | | | | | | | | Also override the disconnectLocked method in Camera3ZslStream to make sure the Camera3ZslStream specific buffer queue is cleaned up properly. Also revert 0be123df1897fd3fe1b7ba30f24d8ae4c91b4dc7, as it was not the right fix. Change-Id: I89bdcb2e206379ae1f2602421e7fdbcde9a31399
* camera: clear ZSLQueue when switching modesRuchit Sharma2014-07-221-0/+1
| | | | | | | not clearing the queue here will eat up unnecessary memory every time we switch from video to still mode. Change-Id: I279ec709b485ca0dab672464e5b829be849bcaa5
* Merge "cameraservice: remove record stream in stopPreview" into lmp-devYin-Chia Yeh2014-07-221-0/+7
|\
| * cameraservice: remove record stream in stopPreviewYin-Chia Yeh2014-07-181-0/+7
| | | | | | | | | | | | Remove recording stream every time stopPreview is called. Change-Id: Iabb783a75418aa41ddc2693cfdfd5a2131109070
* | Camera HAL3: migrate from partial quirks to partial resultZhijun He2014-07-163-13/+22
|/ | | | | | | | | | - Enable the normal partial result path for HAL3.2, the quirk is only used for the HAL version lower than HAL3.2. The partial quirks is no longer supported for HAL3.2 or higher versions. - Add CameraDeviceBase getDeviceVersion API. - Fix some build warnings Change-Id: I7a1b03d4d5fd5258d2addfba4368bee2ba691337
* Camera3: Add capture intent for ZSL captureZhijun He2014-07-082-5/+50
| | | | | | Also fix the warning condition in input buffer return path. Change-Id: I90e9edc1db9f1de87bc8936000b00c3306160c71
* Camera3: fix ZSL processor3 issuesZhijun He2014-07-022-19/+66
| | | | | | | | | | | | | | | | - Return input buffer in capture result. Per hal3.2 spec, we should return the input buffer in process capture result rather than immediately after process capture request. - Make the depths of mZslQueue and mFrameList the same. It doesn't make sense mFrameList depth is larger than mZslQueue depth. - Set the depths of mZslQueue and mFrameList based on pipelineMaxDepth. - Clear result queue while clearing zsl buffer queue. - Hook up camera3 buffer listener with ZslProcessor3, make sure that adding the same listener multiple times has no effect. - Remove flush call in pushToReprocess, it is a guaranteed deadlock once camera3 buffer listener is hooked up. Change-Id: I285155ab4241e827145855d628f8e98b881c01d5
* Camera1: Don't send partial results to ZSL clientsZhijun He2014-06-275-7/+18
| | | | | | | | | ZSL clients expect each received result as a complete result, and send back to HAL as a reprocess capture request. CaptureSequencer client assumes results to be non-partial too, it need look into some metadata that may not be present in partial results. Change-Id: Id716913fd6e1c914726abd6610fddf91141783c2
* Merge "cameraservice: Deprecate triggerId tags"Yin-Chia Yeh2014-06-252-13/+19
|\
| * cameraservice: Deprecate triggerId tagsYin-Chia Yeh2014-06-242-13/+19
| | | | | | | | | | | | | | | | | | | | The following two tags are deprecated from HAL 3.2: ANDROID_CONTROL_AF_TRIGGER_ID ANDROID_CONTROL_AE_PRECAPTURE_ID Trigger IDs are now internal to camera service. Change-Id: Iaebd62ecb0905a811fa37fe7850e0221c38a0006
* | Camera: Clear ZSL buffer queue when jpeg size is changedZhijun He2014-06-231-0/+17
|/ | | | | Bug: 15284653 Change-Id: I4778e8443945d918801102ba600874568bde12dc
* Camera2: get stream configs by device verisonYin-Chia Yeh2014-06-204-55/+151
| | | | | | | | | | | | | | | | Starting from device version 3.2, the following tags: ANDROID_SCALER_AVAILABLE_FORMATS ANDROID_SCALER_AVAILABLE_JPEG_MIN_DURATIONS ANDROID_SCALER_AVAILABLE_JPEG_SIZES ANDROID_SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES ANDROID_SCALER_AVAILABLE_RAW_MIN_DURATIONS ANDROID_SCALER_AVAILABLE_RAW_SIZES are deprecated and replaced by: ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS Change-Id: Iadc34af0ea985a16a25759d7a9a3eb4845c486fd
* Merge "Camera2/3: Don't release recording buffer when stream is active"Zhijun He2014-06-201-4/+7
|\
| * Camera2/3: Don't release recording buffer when stream is activeZhijun He2014-06-181-4/+7
| | | | | | | | | | | | | | | | | | It is dangerous to release all recording buffers when recording stream is actively sending buffer to encoder. This change only releases all buffers when recording stream is idle and recording stream is about to start. Bug: 15667833 Change-Id: Ia4a84cac84a2062c13333467c66698273ffb0e23
* | cameraservice: Implement HAL1 and higher HAL API coexistenceZhijun He2014-06-191-1/+1
|/ | | | | | | A higher hal version device like HAL3.2 can be opened as HAL1.0 device if HAL supports it. This only applies to camera API1. Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
* Camera3: Separate the video and preview size filteringZhijun He2014-06-102-14/+36
| | | | | | | | | | | Supported video sizes were generated from supported preview sizes, which effectively filtered out sizes larger than 1080p. This change filters the supported video sizes based on the media profiles supported h.264 max video frame width and height. Bug: 15287656 Change-Id: Ifbd9d37fb775371e2a4ee5cf80abbf83a75ffd65
* camera2: Update CameraService for HAL1 shim.Ruben Brunk2014-05-211-18/+1
| | | | | | | | | | | | | | Updates the camera service to handle shim connections. Changes include: - Adds begin/end configure binder calls. - Adds cache for shim client static camera metadata. - Implements basic getCameraCharacteristic functionality for shim clients. Bug: 15116722 Bug: 15117269 Change-Id: I510c5888ca15f8e7d3b8ed1680ff1c7f8f514744
* am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry ↵Eino-Ville Talvala2014-05-121-0/+3
|\ | | | | | | | | | | | | count before reading it" * commit '7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0': camera: check Intent entry count before reading it
| * am f02f06c4: Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| |\ | | | | | | | | | | | | * commit 'f02f06c422a58ddaca49d14f21a196eaa435d07b': camera: check Intent entry count before reading it
| | * camera: check Intent entry count before reading itYuvraj Pasi2014-05-121-0/+3
| | | | | | | | | | | | | | | | | | | | | In case when find() returns empty entry, blindly reading the entry will cause segfault Change-Id: Ib5be7fd855c409ba3b45f0d43e15237367172817
| * | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS ↵Igor Murashkin2014-03-252-44/+121
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | single/range values * commit '0370be96e33ea0c8fb4069e704deccce43b7403c': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values