summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/api1/client2
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleakEino-Ville Talvala2016-06-231-0/+8
| | | | | | | | Subtract address of a random static object from pointers being routed through app process. Bug: 28466701 Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
* Camera: API1 shim: select better default FPS rangeYin-Chia Yeh2015-09-111-2/+2
| | | | | Bug: 23992350 Change-Id: Ie86b24d9e5ea753c6dfc2e5526d371b339be96a1
* Camera2Client: handle slower jpeg stream sensorYin-Chia Yeh2015-07-163-6/+97
| | | | | | | | | | | If largest jpeg stream cannot sustain 30 FPS, don't create jpeg stream until takePicture is called and remove it after still capture is done. Also, disable video snapshot for such sensors so video snapshot won't slow down video recording. Bug: 22231605 Change-Id: I2b34d2537c224694ae10f2006b5a46be45a1b1a6
* CameraService: Add consumer name to output stream dumpsysEino-Ville Talvala2015-06-098-13/+13
| | | | | | | | | | Also switch use of ANativeWindow to Surface, to get to the getConsumerName() method where necessary. Surface can always be cast to ANativeWindow, but not the other way around, so it's a better option anyway. Change-Id: Ie5c2d30821c1a754f9e382699ff50b4b328288b3
* Camera1 API: Support SW encoders for new camera HALsEino-Ville Talvala2015-06-086-44/+112
| | | | | | | | | | | | - Support new set video format/dataspace command in camera service - HALv3: Select gralloc usage flags based on format - HALv1: Pass format command directly to HAL layer - Use format/dataspace command in CameraSource - Switch all API1 recording to use metadata mode - Switch all >= HALv2 API1 recording to use kMetadataBufferTypeANWBuffer Bug: 13222807 Change-Id: I2e609b92c65792611bb1dab09e0c41c363ebbc42
* Camera: API1 shim: notify shutter correctlyYin-Chia Yeh2015-05-192-11/+52
| | | | | | | | | Previous implementation only notifies the callback when we receive full capture result. This implementation notifies the callback once HAL sends capture start callback. Bug: 12530628 Change-Id: Ibf71d532b5cf649514b316e35683c217021698b4
* Camera: API1 shim: Don't tightly apply crop regionEino-Ville Talvala2015-04-302-93/+37
| | | | | | | | | | | | | | | | | | | | | Due to older HAL compatibility, we have been setting a tight crop region that just bounds the current output streams. However, this did not take into account any possible ZSL output stream, so correct application of our stream cropping rules to ZSL results in double-crop scenarios, if the ZSL stream aspect ratio does not match the aspect ratio of the other output streams. Since all current HALs follow the correct stream cropping rules (or at least sufficiently ignore them for ZSL), simplify the cropping substantially - now either calculate the crop region based purely off the active array dimensions and zoom factor, or purely off the preview stream and zoom factor. The former is used for setting the request crop, and the latter is used for converting coordinates for metering regions. Bug: 20316691 Change-Id: I5a0bc2e7c09cf60fbae4220566540ca9e674d652
* DO NOT MERGE: The preview frame data is broken when sending via Binderdaisuke jinno2015-04-281-1/+1
| | | | | | | | | | | [Cause] CallbackProcessor uses always same buffer to send preview data. A buffer is written before it is read by user process. [Solution] Increment buffer index correctly. Change-Id: I87a7e3dc6546448a419c96aa58ace3b7d086bf70
* Camera: iterate through all encoders for finding max video sizeYin-Chia Yeh2015-03-311-6/+20
| | | | | Bug: 19712132 Change-Id: I5c1fc748fcc756f6665c31951f8af8a37ff4254d
* Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-194-8/+8
|\
| * Camera: plumbing rotation field throughYin-Chia Yeh2015-03-184-8/+8
| | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | libcameraservice: Stop using IGBC::BufferItemDan Stoza2015-03-125-10/+11
|/ | | | | | | | Switches all uses of IGraphicBufferConsumer::BufferItem (and BufferQueue::BufferItem) to the BufferItem in libgui. Depends on frameworks/native I699ed0a6837076867ca756b28d1ffb2238f7a0d9. Change-Id: I187b3a7d05196b6289596afac8fb9a9d4aebff76
* Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-064-5/+10
| | | | | | | - Remove unused arguments from ICameraDeviceUser::createStream - Add dataSpace as a stream parameter, plumb it through everything Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
* Camera: Remove RAW_SENSOR in favor of RAW16Eino-Ville Talvala2015-02-191-3/+3
| | | | Change-Id: I69ca24c69f58be958efdef300b127401d2b2e880
* am 668b0550: am 597ce69a: Merge "Camera: Add support for SCENE_MODE_HDR for ↵Eino-Ville Talvala2014-12-081-0/+6
|\ | | | | | | | | | | | | newer HALs" into lmp-mr1-dev * commit '668b055081bb9d0d61775acf67bb27ce66b214f6': Camera: Add support for SCENE_MODE_HDR for newer HALs
| * Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-devEino-Ville Talvala2014-12-051-0/+6
| |\
| | * Camera: Add support for SCENE_MODE_HDR for newer HALsEino-Ville Talvala2014-12-051-0/+6
| | | | | | | | | | | | | | | Bug: 18640480 Change-Id: I7b772d10b2bd136c78395fd2816114b27bb48d00
* | | am 07e19019: am 9257000c: camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-081-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '07e190190ffddfbc32ecbf0bd9a9679817da232b': camera: fix logging in ZslProcessor to avoid spam
| * | camera: fix logging in ZslProcessor to avoid spamRuchit Sharma2014-12-051-1/+1
| |/ | | | | | | | | | | | | | | | | | | AF state mismatch while selecting ZSL candidate should not be treated as a warning. This results into undesriable spam in the logs. ALso, using ALOGVV is consistent with how AE state mismatch is handled in ZslProcessor3.cpp Bug: 18634318 Change-Id: Ia9d7f2bb98f784990b1a6f923983c35f622c3791
* | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-201-2/+4
|\ \ | |/ |/| | | | | * commit '902dc42d79b075395d484ce1c71f215b199aaa2a': C++11 compatibility.
| * C++11 compatibility.Dan Albert2014-11-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix string literal concatenation to not be interpreted as UD literals. * Add constexpr compatibility for non-integral static members. * Use __typeof__ instead of typeof (should become decltype once this actually becomes C++11). * Add an appropriate cast for atomic_uintptr_t, since moving to C++11 means moving from <stdatomic.h> to <atomic>, which has better typechecking (hooray for not macros!). Bug: 18466763 Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
* | Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-devYin-Chia Yeh2014-11-192-0/+6
|\ \
| * | Camera2Client: remove recording stream if necessaryYin-Chia Yeh2014-11-182-0/+6
| | | | | | | | | | | | | | | Bug: 17495165 Change-Id: I11b763fde8f9448f4bddec3fe6c81581e7699edb
* | | CameraService: normalize face rectangles properlyChien-Yu Chen2014-11-133-73/+90
|/ / | | | | | | | | | | | | | | | | Use android.scaler.cropRegion reported in the capture result to normalize face rectangles instead of using the one in current capture request. Bug: 11460393 Change-Id: Id21834bf6ae1f7cc106b4dffb98f9f249a75034b
* | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-0710-10/+10
|\ \
| * | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-0410-10/+10
| |/ | | | | | | | | | | | | | | Passes the BufferItem for the queued buffer to the onFrameAvailable callback so the consumer can track the BufferQueue's contents. Bug: 18111837 Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
* | CameraService: API1: fix picture FOVChien-Yu Chen2014-10-281-0/+14
|/ | | | | | | | | Fix the wrong assumption that active array size equals to pixel array size. bug 17918247 Change-Id: Ic308f281fb677332a74e95abb473c5b13063eeca
* CameraService: API1: Reallocate JPEG ashmem heap if size changesEino-Ville Talvala2014-09-291-1/+14
| | | | | Bug: 17682603 Change-Id: I7cba3365d00c33cf4267b1b59a94bd7d0bba08df
* Camera2Client: Revert HALv2 device behavior back to MR2Eino-Ville Talvala2014-09-281-1/+1
| | | | | | | | | | | | | | - Do not idle device before video snapshot stream configuration, to avoid deadlock during waiting. - Do not tear down ZSL stream - Don't refresh ZSL stream after deletion was requested. The v2 HAL implementations really don't like the ZSL stream being touched ever. Bug: 17634430 Bug: 17628507 Change-Id: I36b44a395e697be9802c4bd917a82b77c8d04be2
* CameraService: API1: Fix flash modeEino-Ville Talvala2014-09-271-1/+1
| | | | | | | | Sometimes it's useful to ensure variables are initialized in all code paths. Bug: 17680416 Change-Id: I9bed8a3bcb94417384bf0551fe1c0eee6cc49577
* Camera1 shim: If there's no flash, the keys need to be null.Eino-Ville Talvala2014-09-251-10/+13
| | | | | | | | | | | | | | | | Previously, we set FLASH_MODE_OFF for FLASH_MODE when a flash unit isn't available. However, per the API documentation, the key has to be null instead. - Make sure that the flash mode and supported flash mode keys are null if there's no flash unit on start - Don't set flash mode in later setParameters calls if there is no flash unit - Map NULL value for flash mode key to FLASH_MODE_OFF for internal consistency. Bug: 17660716 Change-Id: I3033682f0b882b8c2004114e2afef31662caebda
* API1: ZSL buffers should be skipped for manual AF modeZhijun He2014-09-191-0/+5
| | | | | | | | | ZSL counts on good auto focus (CAF). It is really tricky to enable ZSL for manual focus mode. as it is bascically a locked focus mode, you can not tell if the focus is good or not by reading the afstate. Bug: 17577928 Change-Id: I68ff7d143e7d56f942bb00a8da6a9faea57b52a0
* 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-142-0/+50
| | | | | | | | | | | | | | | | | | 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
* | Camera2: fix 4K recordingYin-Chia Yeh2014-09-132-0/+41
|/ | | | | Bug: 17484683 Change-Id: I09bb12698057555329286c777102b9b310452fb3
* Merge "Camera2: improve ZSL candidate selection logic" into lmp-devYin-Chia Yeh2014-09-122-2/+29
|\
| * Camera2: improve ZSL candidate selection logicYin-Chia Yeh2014-09-112-2/+29
| | | | | | | | | | | | | | | | | | 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-104-2/+49
|\ \ | |/ |/|
| * camera2: Fix video snapshot for HAL 2.* devices.Ruben Brunk2014-09-094-2/+49
| | | | | | | | | | | | | | | | | | | | | | 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-082-2/+67
|\ \
| * | Camera2: reconfigure video snapshot size if neededYin-Chia Yeh2014-09-082-2/+67
| |/ | | | | | | | | | | | | | | 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
* | 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 "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