summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
...
* | | camera: Let #connectLegacy calls through with unspecified HAL versionIgor Murashkin2014-06-201-1/+8
| | | | | | | | | | | | | | | | | | | | | This enables the camera2 shim to open a camera1 device without turning the error codes into a RuntimeException. Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
* | | cameraservice: Implement HAL1 and higher HAL API coexistenceZhijun He2014-06-194-27/+126
|/ / | | | | | | | | | | | | 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
* | Merge "camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService"Igor Murashkin2014-06-172-23/+145
|\ \
| * | camera: Add #getLegacyParameters, #supportsCameraApi to ICameraServiceIgor Murashkin2014-06-172-23/+145
| |/ | | | | | | Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
* | CameraService: Fix permissions check issuesEino-Ville Talvala2014-06-171-4/+5
|/ | | | | Bug: 15677063 Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
* Merge "camera2: Add jpeg sizes to legacy mode static characteristics."Ruben Brunk2014-06-161-9/+20
|\
| * camera2: Add jpeg sizes to legacy mode static characteristics.Ruben Brunk2014-06-121-9/+20
| | | | | | | | | | | | | | | | Bug: 15116722 - Adds jpeg size mapping to available output formats. Change-Id: I73e46dd4309767ba41156d9ba03c4724bf234758
* | Merge "Camera3: Separate the video and preview size filtering"Zhijun He2014-06-102-14/+36
|\ \ | |/ |/|
| * 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
* | am 3416f9ac: Merge "Camera2: Add null check to createStream" into ↵Yin-Chia Yeh2014-06-111-0/+4
|\ \ | | | | | | | | | | | | | | | | | | lmp-preview-dev * commit '3416f9ac471f97e9544ee821a97a101cbdd25b11': Camera2: Add null check to createStream
| * | Camera2: Add null check to createStreamYin-Chia Yeh2014-06-101-0/+4
| |/ | | | | | | | | | | | | Prevent a native null dereference crash. bug: 15332257 Change-Id: I10c4053a0b4f07fbf52c37dd2f2853b501def669
* | resolved conflicts for merge of f285c91e to masterElliott Hughes2014-05-221-2/+2
|\ \ | |/ |/| | | Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65
| * am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-2/+2
| |\ | | | | | | | | | | | | * commit 'd551633916d3677da4dda10aba6837bdc6803ee0': Move frameworks/av from fdprintf to POSIX dprintf.
| | * Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-2/+2
| | | | | | | | | | | | | | | Bug: 11156955 Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
* | | camera2: Update CameraService for HAL1 shim.Ruben Brunk2014-05-215-89/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| | |\
| | | * 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
| * | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-295-99/+213
| |\ \ \ | | |/ / | |/| |
| | * | 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
| | * \ \ am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '4f53fe74051026e6635ba5bdbed4f1898cb66028': CameraService: deadlock fix
| | * | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aospColin Cross2014-03-2120-70/+80
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I19e1a26bd0226119c4fe2920bf6a09aaeff315d9
| | * \ \ \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bd3e2e03f3ab686c52982a9e50cae853128172cf': camera2: Fix segfault when using null availability listener
| | * \ \ \ \ am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-141-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only
| | * \ \ \ \ \ am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ↵Zhijun He2014-03-101-0/+16
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is changed * commit 'bc69c8ba9a8fc881603669205a56d0ca1b572a95': DO NOT MERGE: Camera: delete preview callback when preview size is changed
| | * \ \ \ \ \ \ am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a11111f9135c98cf4247bbd1a61d7df3053e549e': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
* | | \ \ \ \ \ \ \ Merge "Camera3: fix missing string in logging code"Zhijun He2014-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Camera3: fix missing string in logging codeZhijun He2014-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I15da6bb8b586b4641837f42d2145530fb45dd0bd
* | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-051-1/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+14
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12134423 Change-Id: I97dc955ee9dd78ace93a7946296d6d9b0e407d43
* | | | | | | | | | | Merge "NULL check in ConnectPro"Natalie Silvanovich2014-05-051-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | NULL check in ConnectProNatalie Silvanovich2014-05-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents service crash Bug: 13744720 Change-Id: I7a5cdba830b4f96660f890ede6b94c38fc3108dd
* | | | | | | | | | | Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""Ruben Brunk2014-05-031-14/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-031-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4764324d2704f1b08bb7407014bf203924ff2363. Change-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76
* | | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-021-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+14
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12134423 Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
* | | | | | | | | | | Camera3: Don't notifyError for non-fatal errorsZhijun He2014-05-011-3/+0
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14448494 Change-Id: Ie2e2dc6a8475189707c556845adb77f20f270df5
* | | | | | | | | | Camera3: scale the max jpeg buffer size based on resolutionsZhijun He2014-04-252-2/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The max jpeg buffer size was always the android.jpeg.maxSize, regardless of the actual jpeg capture size. This creates a huge memory waste especially for smaller size jpeg capture. Now the max jpeg buffer is linearly scaled based on the resolution. Bug: 14288983 Change-Id: I8a971b8e2f4fc7fec0154547bdb688579af71a47
* | | | | | | | | | camera3: Don't hold mLock during flush callZhijun He2014-04-211-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAL calls into Camera3Device functions like processCaptureResult during flush call. When Camera3Device runs into error state during flush call, processCaptureResult calls setErrorState(), which leads to deadlock. Change-Id: I35a03f6eb4b77f914097917cb37de98663de365f
* | | | | | | | | | Merge "CameraService: fix waitUntilIdle bug revealed by TestingCamera2."Jianing Wei2014-04-212-4/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | CameraService: fix waitUntilIdle bug revealed by TestingCamera2.Jianing Wei2014-04-212-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * clear mStreamingRequestList in flush * fix frame number checker in notify and processCaptureResult Bug: 14166437 Change-Id: I022421080d05138f9068c1b9b85d83bd613b04fb
* | | | | | | | | | | am dae621c2: am 95006625: Merge "camera: set mNeedConfig after creating ZSL ↵Eino-Ville Talvala2014-04-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stream" * commit 'dae621c2c7f40f1587b97636975908e1374ade9a': camera: set mNeedConfig after creating ZSL stream
| * \ \ \ \ \ \ \ \ \ \ am 95006625: Merge "camera: set mNeedConfig after creating ZSL stream"Eino-Ville Talvala2014-04-211-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '95006625bd1c562c952833bf08c52e7e6c524363': camera: set mNeedConfig after creating ZSL stream
| | * | | | | | | | | | camera: set mNeedConfig after creating ZSL streamYuvraj Pasi2014-04-151-0/+2
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set mNeedConfig after creating ZSL stream, camera device will reconfigure for the case when only ZSL stream is changed. Change-Id: Ib592817f81125969824a1280349f77973116f375
| * | | | | | | | | | am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for ↵Igor Murashkin2014-03-252-44/+121
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview FPS single/range values * commit '65550a0e17852fe657795508e3bf05bdbfb2520b': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
| | * \ \ \ \ \ \ \ \ \ 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
| | | * | | | | | | | | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-252-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 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
* | | | | | | | | | | Camera3: block until get an available bufferZhijun He2014-04-187-22/+103
| |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera3Stream shouldn't error out when the max number of buffers are already dequeued. It should block until next buffer returned from camera device. Bug: 11595505 Change-Id: If65a70c29cb04219e14ded0744059c0ab783444b
* | | | | | | | | | Merge "CameraService: fix race condition and wrong last frame number."Jianing Wei2014-04-172-156/+71
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-09-14 17:55:02 +0000