summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
* Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-0623-53/+93
| | | | | | | - Remove unused arguments from ICameraDeviceUser::createStream - Add dataSpace as a stream parameter, plumb it through everything Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
* camera: implement flashlight for HAL v1 devicesChien-Yu Chen2015-03-039-23/+322
| | | | | | | | | Implement flashlight for HAL v1 devices and remove CameraHardwareInterface's dependency on CameraService to avoid circular dependency. Bug: 2682206 Change-Id: Id5bbccef085b607a6189763fd7fbe2e3f26868c8
* camera: fix flashlight implementation for HAL v2Chien-Yu Chen2015-03-034-201/+423
| | | | | | | | | | | | | | | | | | Update torch availability when the camera device availability changes. For device HAL v2 and v3 implementation, notify torch unavailable for all camera devices with a flash unit when a camera device is opened. Notify torch available for all camera devices with flash unit when all camera devices are closed. Don't invoke torch status callback in camera service. Invoke torch status callback in HAL or FlashControlBase implementations to avoid race condition. Clean up previous CL. Bug: 2682206 Change-Id: I24f5478f467b2c680565fe98f112eef33e2547a1
* Merge "CameraService: fix invalid access of camera metadata"Yin-Chia Yeh2015-02-201-8/+7
|\
| * CameraService: fix invalid access of camera metadataYin-Chia Yeh2015-02-181-8/+7
| | | | | | | | | | | | static_camera_characteristics is not defined in API1. Change-Id: I422953081b0a5581e12fc4b16052b67ca8062186
* | Merge "Camera: Remove RAW_SENSOR in favor of RAW16"Eino-Ville Talvala2015-02-202-4/+4
|\ \
| * | Camera: Remove RAW_SENSOR in favor of RAW16Eino-Ville Talvala2015-02-192-4/+4
| |/ | | | | | | Change-Id: I69ca24c69f58be958efdef300b127401d2b2e880
* | Merge "camera: implement flashlight control"Chien-Yu Chen2015-02-195-1/+879
|\ \
| * | camera: implement flashlight controlChien-Yu Chen2015-02-125-1/+879
| |/ | | | | | | | | | | | | | | Implement flashlight API for module v2.4 by calling module APIs and by for hal v2 and v3 by using CameraDeviceBase. Bug: 2682206 Change-Id: Ib8b77f6fd462489d672f27e14fe37801d35b7544
* | Look up user-specific device policy for disabling cameraAmith Yamasani2015-02-131-1/+5
|/ | | | | | | | | | | | | | Camera can be disabled on a per-user basis by device admins. Changed the system property format to be per-user so that the policy can be applied based on calling user. TODO: Ideally this policy information should be pulled from the DevicePolicyManager rather than relying on system properties. Property changes will not be applied immediately either, if there's no listener. Bug: 19345698 Change-Id: Ia00034726260bc9ff28ac592f20a27b5c9a77d58
* CameraService: intercept Camera moduleYin-Chia Yeh2015-02-0321-61/+259
| | | | | | | | Wrap camera module returned from HAL so get_camera_info returns static_camera_characteristics processed by framework, which generates keys added after HAL3.2 is released. Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
* am a789e519: am 0c4e56d0: Camera: make sure jpeg buffer size isn\'t too smallYin-Chia Yeh2015-01-201-4/+3
|\ | | | | | | | | * commit 'a789e51942c7572e0c9f54326d6d9d0ff65d6941': Camera: make sure jpeg buffer size isn't too small
| * Camera: make sure jpeg buffer size isn't too smallYin-Chia Yeh2015-01-201-4/+3
| | | | | | | | | | | | | | | | Assuming the jpeg header can take up to 256KB, make sure we always allocate enough size for the image data. Bug: 18962703 Change-Id: I08eb3d198d12f71f3ab7266324e80fe7410bdc89
* | am 0fd52ac2: am 6eac9e2f: Merge "Camera2Client: flush requests in ↵Chien-Yu Chen2014-12-161-0/+9
|\ \ | |/ | | | | | | | | | | stopPreviewL" into lmp-mr1-dev * commit '0fd52ac2929f6ded984cc3a063645d65b5e2006f': Camera2Client: flush requests in stopPreviewL
| * Camera2Client: flush requests in stopPreviewLRuchit Sharma2014-12-151-0/+9
| | | | | | | | | | | | | | | | | | Requests queued in the pipeline have little meaning after the app calls stopPreview(). Flushing will help improve the switch KPI. bug 17340914 Change-Id: I899d69aa3b0fd41f028760290a81013297712fed
* | am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter after ↵Chien-Yu Chen2014-12-102-141/+234
|\ \ | |/ | | | | | | | | | | result" into lmp-mr1-dev * commit '61697a5c1ddd2ad882a889474822851187734cf4': Camera3Device: support shutter after result
| * Merge "Camera3Device: support shutter after result" into lmp-mr1-devChien-Yu Chen2014-12-092-141/+234
| |\
| | * Camera3Device: support shutter after resultChien-Yu Chen2014-12-092-141/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the code to remove in-flight requests from processCaptureResult to a separate function so it can be called when the framework receives a result or a shutter event. An in-flight request will only be removed when both results and the shutter event arrive in the case of a successful request. Also send out results only after the shutter event receives. Bug: 18135776 Change-Id: I340db1a495c711b0913784d43fd0f144871e4420
* | | Merge commit '2340e5a8' into manualmergeRuben Brunk2014-12-092-4/+81
|\ \ \ | |/ / | | | | | | Change-Id: I0299d49b7e283072fc646de717fd7c1643241984
| * | Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-devRuben Brunk2014-12-092-4/+81
| |\ \ | | |/ | |/|
| | * Camera2: Round unsupported surface sizes in configure.Ruben Brunk2014-12-052-4/+81
| | | | | | | | | | | | | | | Bug: 16030677 Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
* | | 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 ec7b26f0: am 512dd849: Merge "camera: fix frame deletion logic in ↵Zhijun He2014-11-261-2/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | mInFlightMap" into lmp-mr1-dev * commit 'ec7b26f06f7b1b6334ef1139ac33548ed0510284': camera: fix frame deletion logic in mInFlightMap
| * | camera: fix frame deletion logic in mInFlightMapRuchit Sharma2014-11-251-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For per-frame error notifications, camera3.h requirements state that all the buffer handles for a failed frame capture must be returned via process_capture_result() call(s). Hence, Camera3Device needs to ensure that the frame entry is not deleted from mInFlightMap until all buffers for that frame have been returned by HAL. Bug: 17757940 Change-Id: I2579ca7980d2fd67d53abc530e2706538f7d3d3a
* | | am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse ↵Ruben Brunk2014-11-211-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | segfault." into lmp-mr1-dev * commit 'ffa3e71e47215b68fe4ae0b7a3f976db648d63d3': Camera2: Fix CameraParameters parse segfault.
| * | Camera2: Fix CameraParameters parse segfault.Ruben Brunk2014-11-201-0/+1
| |/ | | | | | | | | Bug: 18331142 Change-Id: I41feec93f753f97b3e6bf963deb4a42b73406421
* | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-202-3/+5
|\ \ | | | | | | | | | | | | * commit '902dc42d79b075395d484ce1c71f215b199aaa2a': C++11 compatibility.
| * | C++11 compatibility.Dan Albert2014-11-202-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | am cb79b3db: am 03181012: Merge "Camera2Client: remove recording stream if ↵Yin-Chia Yeh2014-11-193-7/+56
|\ \ \ | | |/ | |/| | | | | | | | | | | | | necessary" into lmp-mr1-dev * commit 'cb79b3dbd377b1a3b6da2f58dfa49050400815ae': Camera2Client: remove recording stream if necessary
| * | Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-devYin-Chia Yeh2014-11-193-7/+56
| |\ \
| | * | Camera2Client: remove recording stream if necessaryYin-Chia Yeh2014-11-183-7/+56
| | | | | | | | | | | | | | | | | | | | Bug: 17495165 Change-Id: I11b763fde8f9448f4bddec3fe6c81581e7699edb
* | | | am 771a362d: am 3171f4e1: Merge "CameraService: normalize face rectangles ↵Chien-Yu Chen2014-11-173-73/+90
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | properly" into lmp-mr1-dev * commit '771a362de24be025e8283a91be4201d4d1d4b5d8': CameraService: normalize face rectangles properly
| * | | Merge "CameraService: normalize face rectangles properly" into lmp-mr1-devChien-Yu Chen2014-11-173-73/+90
| |\ \ \ | | |/ / | |/| |
| | * | 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
* | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-178-24/+24
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-178-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | | | am 06ce4cf5: Merge "Camera2Device: fix camera metadata leaks" into ↵Chien-Yu Chen2014-11-122-15/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 7c77c75 * commit '06ce4cf5e3f8715635bc1913dcbb1d32fbd510a7': Camera2Device: fix camera metadata leaks
| * | | Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-devChien-Yu Chen2014-11-122-15/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Camera2Device: fix camera metadata leaksChien-Yu Chen2014-11-102-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | bug 11132653 Change-Id: I5445b020c3aeaac9a556c023568adac635834356
* | | | am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder() calls on ↵Eino-Ville Talvala2014-11-116-16/+26
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | NULL interfaces" * commit '7b28e4e709fcc90f9ca5ca987e2d4e8c05d1a731': Camera: Guard against asBinder() calls on NULL interfaces
| * | Camera: Guard against asBinder() calls on NULL interfacesEino-Ville Talvala2014-11-076-16/+26
| | | | | | | | | | | | | | | Bug: 18207548 Change-Id: I9879c9b4c0282a6b96b77398f62beedc47f7f0a0
* | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-0712-13/+13
|\ \ \
| * | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-0412-13/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | 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: Disconnect: Release mutex while waiting for joins.Eino-Ville Talvala2014-10-221-6/+14
|/ | | | | | | | | | | | | | | The threads shutting down may have callpaths that require taking the binder interface mutex, so waiting to join them with that mutex held can lead to deadlocks. A specific instance is StreamingProcessor calling dataCallbackTimestamp, which can immediately lead to a Camera2Client::releaseRecordingFrame call, which requires the binder interface mutex. If this call happens right when shutdown is occurring, and Camera2Client::disconnect is holding the mutex, deadlock ensues. Bug: 17997578 Change-Id: I71253cd5542b5920ad205976d315110ca0043d94
* Camera2Client: avoid two consecutive sets of configure_streams callsZhijun He2014-10-141-0/+4
| | | | | | | | | | | | When mediaRecorder starts without an active preview stream, Camera2Client starts preview then immediately start recording, which could cause the second configure_streams to call into HAL before any preview request is sent. This could cause HAL to run into bad state. This change work around this issue by making sure the first preview request is submitted to the HAL before start recording. Bug: 17915062 Change-Id: I94ae64ee76487603695a469240da601ddcb29a66
generated by cgit v1.1 at 2024-05-18 06:21:38 +0000