summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "Camera2: handle one more videosnapshot failure" into lmp-devYin-Chia Yeh2014-09-151-13/+7
|\
| * Camera2: handle one more videosnapshot failureYin-Chia Yeh2014-09-151-13/+7
| | | | | | | | | | | | | | | | Handle one more corner case. Also remove redundant re-try path. Bug: 17484683 Change-Id: I0b3e1223f4f28022e7ec6abe028ca3c2623829de
* | Merge "Camera3Device: Treat failure to idle as an error" into lmp-devEino-Ville Talvala2014-09-151-0/+4
|\ \ | |/ |/|
| * Camera3Device: Treat failure to idle as an errorEino-Ville Talvala2014-09-141-0/+4
| | | | | | | | | | Bug: 16899526 Change-Id: Ia995aac6360c9c41ed654af5a7052480f23903d8
* | Merge "Camera1: Validate scene mode override AF mode" into lmp-devEino-Ville Talvala2014-09-141-0/+14
|\ \ | |/
| * Camera1: Validate scene mode override AF modeEino-Ville Talvala2014-09-131-0/+14
| | | | | | | | | | | | | | | | | | Don't allow uncalibrated cameras to list a fixed focus mode for variable-focus cameras, since uncalibrated cameras cannot do INFINITY focus. Bug: 17492043 Change-Id: I5835efd6f21be0ebb74a9b7ea3ef5b2e7cf63e7a
* | Camera3: Update ZSL post-processing tagsZhijun He2014-09-144-0/+58
| | | | | | | | | | | | | | | | | | Update ZSL processing tags according the still capture template Also cache the request template to avoid extra cost of querying into HAL every time. Bug: 17463102 Change-Id: I2eeffefb0a4131c99a85dd3e4484cc6f0f025efa
* | Merge "Camera: Allow larger preview resolutions in API1 for >= HALv2 ↵Eino-Ville Talvala2014-09-132-4/+29
|\ \ | |/ | | | | devices" into lmp-dev
| * Camera: Allow larger preview resolutions in API1 for >= HALv2 devicesEino-Ville Talvala2014-09-132-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | Limit preview resolutions to a max of 1920x1920 instead of 1920x1080p, so that any aspect ratio with a 1920 as the larger dimension can be used. Also improve the initial preview/video size selection logic, to ensure that the selected size is both a valid preview and video size, and not too large. Bug: 17458832 Change-Id: Iea006fadb5fbf0f03d23c3c5babb5b3611469688
* | Merge "Camera2: fix 4K recording" into lmp-devZhijun He2014-09-134-18/+111
|\ \
| * | Camera2: fix 4K recordingYin-Chia Yeh2014-09-134-18/+111
| |/ | | | | | | | | Bug: 17484683 Change-Id: I09bb12698057555329286c777102b9b310452fb3
* | Merge "camera: add latest parameters to dumpsys for api1 cameras" into lmp-devIgor Murashkin2014-09-122-0/+14
|\ \ | |/ |/|
| * 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-126-9/+41
|\ \ | |/ |/|
| * camera2: skip capture result after clearZslQueueYin-Chia Yeh2014-09-116-9/+41
| | | | | | | | | | | | | | | | 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-106-2/+53
|\ \ | |/ |/|
| * camera2: Fix video snapshot for HAL 2.* devices.Ruben Brunk2014-09-096-2/+53
| | | | | | | | | | | | | | | | | | | | | | 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-085-4/+93
|\ \
| * | Camera2: reconfigure video snapshot size if neededYin-Chia Yeh2014-09-085-4/+93
| | | | | | | | | | | | | | | | | | | | | | | | 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: Create a dummy stream when 0 streams are requested." ↵Eino-Ville Talvala2014-08-285-1/+286
|\ \ | | | | | | | | | into lmp-dev
| * | CameraService: Create a dummy stream when 0 streams are requested.Eino-Ville Talvala2014-08-285-1/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A workaround for a camera device HAL v3.2 or older specification hole - it's not acceptable to configure_streams with 0 output streams. However, we allow for this at the public API level, to allow an application to release all output streams. So in this case, create a dummy stream that doesn't actually do anything as a placeholder. Bug: 17220694 Change-Id: Ib25242ffc2c9f2b2f619fd5fe6d652266579da85
* | | 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
* | | Merge "Camera API1: Fix ZSLProcessor3 deadlock" into lmp-devZhijun He2014-08-271-1/+3
|\ \ \ | |_|/ |/| |
| * | 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
* | CameraService: Correct API2 error handlingEino-Ville Talvala2014-08-275-82/+260
|/ | | | | | | | | | | | | | - Add more error codes to the binder camera2 callbacks - Translate HAL errors to callback errors - When flushing, report failures for queued requests - Treat stream config failure as nonfatal - Send request errors when buffers aren't available for captures Bug: 15524101 Bug: 14448494 Bug: 11272459 Bug: 17160301 Change-Id: I81aa54e805a9cce1cb8a6a9374549daa7666deb2
* Camera API1: remove unnecessary buffer count checkZhijun He2014-08-221-9/+0
| | | | | | | | | | This check doesn't work with ZSL use case. Since the ZSL is both an input and output stream, When an input buffer is acquired, checking the handout buffer count for that stream could trigger false alarm when all the output buffers are sent to hal, instead, we should wait for an output buffer to return. Bug: 17188380 Change-Id: I7eb166eb49d2f063189d993195ef389d2cf4f2b4
* Merge "Camera: fix triggerId logic" into lmp-devYin-Chia Yeh2014-08-222-2/+13
|\
| * Camera: fix triggerId logicYin-Chia Yeh2014-08-212-2/+13
| | | | | | | | | | | | | | | | | | Fix missing triggerId introduced by previous cleanup change. bug 17108154 bug 17053130 Change-Id: Ifda55d5fbe992d98f335a8427aa256d78a856586
* | Merge "camera: Configure streams immediately when API2 does configuration" ↵Igor Murashkin2014-08-216-3/+49
|\ \ | | | | | | | | | into lmp-dev
| * | camera: Configure streams immediately when API2 does configurationIgor Murashkin2014-08-206-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the configuration more eager (no more waiting until the first request) and also allows any errors to immediately be sent back to the client. Bug: 16629195 Change-Id: I0c365bc8f760466916dcc089217a43c43f9f4c9d
* | | 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: hal3: Remove register_stream setprop checkIgor Murashkin2014-08-191-12/+1
| | | | | | | | | | | | | | camera3_device_t::register_stream must always be NULL in HAL3.2+ cameras Bug: 13914251 Change-Id: I116ee71135a827c8b4db61cd91f56ba56da3f0ef
* | camera: Allow shutter sounds to be disabled from camera2 apiIgor Murashkin2014-08-196-32/+61
|/ | | | | | | | | | | 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-1111-56/+45
| |/ |/| | | | | | | | | | | | | | | - 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