summaryrefslogtreecommitdiffstats
path: root/camera
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-021-1/+5
|\ | | | | | | | | | | Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ic86e42d5fb8f81fe5c4f58d2e76852829c609760
| * DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleakEino-Ville Talvala2016-06-231-1/+5
| | | | | | | | | | | | | | | | Subtract address of a random static object from pointers being routed through app process. Bug: 28466701 Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
* | camera: Allow devices to load custom CameraParameter codeEthan Chen2015-11-071-1/+15
| | | | | | | | | | | | | | | | * Some devices need additional code to load their cameras. Add a hook for extra classes and symbols to be included. Change-Id: Ifbe79e25b7ab47c5d468f5179032a4283b3f0df5 (cherry picked from commit 38681625992c0029d32eec98fc7e89d71b855b0e)
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-052-5/+45
|\ \ | |/ | | | | | | | | Android 6.0.0 release 26 Change-Id: I8a57007bf6efcd8b95c3cebf5e0444345bdd4cda
| * CameraService: Notify camera service proxy of device statusEino-Ville Talvala2015-08-211-3/+20
| | | | | | | | | | | | | | | | Send the camera proxy service in system server updates to camera device state: opened/closed/active/idle. Bug: 23393557 Change-Id: Id7c70f134821efa34af8f6e7b4caa4c2ab128ebc
| * Merge "Add experimental camera session prepare API." into mnc-dr-devRuben Brunk2015-08-171-2/+25
| |\
| | * Add experimental camera session prepare API.Ruben Brunk2015-08-141-2/+25
| | | | | | | | | | | | | | | Bug: 18949148 Change-Id: I8f73e68ea2e3acc60d98954106f364d13f439a82
* | | camera: Disable extra HDR frame on QCOM_HARDWARERicardo Cerqueira2015-11-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qualcomm camera HALs default to adding an extra zero-exposure frame to HDR snapshots; this is breaking third-party apps, and we don't use it in system-bundled apps, so disable it unless explicitly requested by the client Change-Id: Iecb868c5c344d972de7f36dc1bd9cc9fdbabaf4e
* | | Camera: Add support for manual 3A.Peng Zhu2015-10-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add manual white balance mode. user can set the specific cct to lock the white balance.Just as other white balance mode, it will lock the white balance once it's set, the only difference it that the cct value is set from app. Add manual focus mode allow app to set the focus distance with DAC value or actuator step value. Once the value is set, the focus distance is locked unless app switch it back to automatically mode Change-Id: I0c08ad0cea27284645e9e710c26844ca24a5c477
* | | camera: Don't segfault if we get a NULL parameterSteve Kondik2015-10-171-0/+3
| | | | | | | | | | | | | | | | | | * Values end up NULL on some drivers, don't crash. Change-Id: Ic897dbd4629cf3af98c85f93be202c382dde806b
* | | camera: allow device to append camera parametersKonsta2015-10-141-0/+5
| | | | | | | | | | | | | | | | | | | | | Overload using include/camera/CameraParametersExtra.h in device tree to add device specific camera parameters. Change-Id: Ie79380f4e49661348df4b2028ddf48daa67fca2d
* | | Camera: Add support for preview frame fdSusmitha Gummalla2015-10-061-3/+14
|/ / | | | | | | | | | | | | -Add support for receiving dataCallback with fd/buffer as frame buffer CRs-fixed: 654901 Change-Id: I5c16e560f1e209a6ab4afa4f3437602b02992b9b
* | Camera: Add camera type to ICameraService.getNumberOfCameras.Eino-Ville Talvala2015-08-141-2/+9
|/ | | | | | | | | Also determine the number of 'normal' cameras present on camera service startup, and ensure that all normal cameras have IDs lower than the 'strange' cameras. Bug: 23194168 Change-Id: I1f7b14825cb52707de698a955f85da1eaa932663
* CameraMetadata: Add sanity check to avoid accidental memory corruption.Eino-Ville Talvala2015-07-171-0/+11
| | | | | | | | | Update shouldn't be called with a pointer from the metadata structure being updated, since it might be resized. The API really needs rework, but until that happens, detect this condition and error out. Bug: 22542551 Change-Id: I896c34d8134ac3b101d050fc8aa5d203a08e7267
* Camera: Add hidden experimental tearDown method.Eino-Ville Talvala2015-07-161-1/+23
| | | | | Bug: 18949148 Change-Id: Ie86ec7d1ec3db54e1154563b2339a208a935f849
* camera2: Fix native binder interface and add tests.Ruben Brunk2015-07-067-15/+511
| | | | | | | | | - Add CameraBinderTests for limited coverage of native camera2 binder interfaces for the camera service. - Fix several bugs in the native binder interfaces. Bug: 18468810 Change-Id: Iab2d81a5cacd20daf7454aeeed033cc13d88452c
* Merge "Update signature of writeBlob." into mnc-devJeff Brown2015-06-061-1/+1
|\
| * Update signature of writeBlob.Jeff Brown2015-06-051-1/+1
| | | | | | | | | | Bug: 21428802 Change-Id: Iec7e72369989a7c769be6169ead8afae8fe33b67
* | Camera: Change error for app ops reject, propagate binder errorsEino-Ville Talvala2015-06-052-7/+17
|/ | | | | | | | | | | | | | | | | | | | | | INVALID_OPERATION surfaces as an non-specific device-level error to applications in the onError callback. This is not a condition apps targeting camera2 in L will generally have to deal with. Instead, return -EACCESS which maps to throwing CameraAccessException.CAMERA_DISABLED, same as disabling camera access with DevicePolicyManager. The old camera API converts any error code to -EACCESS at the JNI layer, so this doesn't change anything for the older API. Also update the various native ICameraService binder connect calls to check for the transact error code, and return it if it is not OK. Without this, PERMISSION_DENIED transact errors from the camera service cannot be distinguished from CAMERA_DISABLED errors in some codepaths. Bug: 21604925 Change-Id: Ifccc8989b8c20653429e2d3e51dba7abb2be9c35
* Camera2: implement high speed video APIsZhijun He2015-06-031-2/+5
| | | | | Bug: 21442271 Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
* Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-devRuben Brunk2015-05-202-0/+56
|\
| * camera: Add AIDL interface for CameraServiceProxy.Ruben Brunk2015-05-202-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | - Adds an AIDL interface to allow the proxy camera service running in system server to accept RPCs from the camera service running in mediaserver. - Request an update to the valid user set from the proxy camera service when mediaserver restarts to initialize properly + avoid DOS after a crash. Bug: 21267484 Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
* | Use memset to initialize dynamic array.Chih-Hung Hsieh2015-05-181-1/+2
|/ | | | | | | | clang/llvm rejects int32_t events[len] = {};. BUG: 21269094 Change-Id: I0257bfbb72f1b49913baba0164d5a3a7976c452d
* camera2: Fix work-profile eviction handling.Ruben Brunk2015-05-141-5/+23
| | | | | Bug: 20124384 Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
* Revert "Add camera app op - camera"Svetoslav Ganov2015-05-123-18/+19
| | | | | | | | This is not needed duplication of work This reverts commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9. Change-Id: I2c81b0dacb2ed99c408c79c1f9e22a4baa564494
* Add camera app op - cameraSvet Ganov2015-05-023-19/+18
| | | | Change-Id: I26570cc0a23fdea740b416a26838d40cac296c85
* Camera2: Add prepare for output streamsEino-Ville Talvala2015-04-152-2/+45
| | | | | | | | | The prepare call asynchronously pre-allocates buffers for a given output stream, and then fires the onPrepared callback. Not implemented for Camera2Device or used in Camera2Client. Change-Id: I1cccdfff846dd6985133c591dbdceed823929ade
* camera2: add reprocess supportChien-Yu Chen2015-04-132-0/+83
| | | | | | | Add support to create input stream, submit reprocess capture requests, and receive reprocess capture results. Change-Id: Iee2d4313f3d52616a484eaea7a28f5ef9d8a674b
* camera2: Enforce client eviction on user switch.Ruben Brunk2015-03-311-0/+16
| | | | | Bug: 19186859 Change-Id: I172a2ce46c8e8a131ae7e8dd99d60c5f4f0d6668
* Merge "Camera: fix metadata assertion"Yin-Chia Yeh2015-03-251-1/+1
|\
| * Camera: fix metadata assertionYin-Chia Yeh2015-03-241-1/+1
| | | | | | | | | | Bug: 19897963 Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff
* | camera2: Remove ProCamera.Ruben Brunk2015-03-208-2227/+8
|/ | | | | Bug: 19186859 Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
* Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-193-20/+92
|\
| * Camera: plumbing rotation field throughYin-Chia Yeh2015-03-183-20/+92
| | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-191-0/+4
|\ \ | |/ |/|
| * camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-181-0/+4
| | | | | | | | | | | | | | | | | | - This updates the CameraService to implement client eviction behavior based on process priority. Bug: 19186859 Change-Id: I646939b1cdf1a2237c4e5044164d55a2542cf36e
* | Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-061-13/+2
|/ | | | | | | - Remove unused arguments from ICameraDeviceUser::createStream - Add dataSpace as a stream parameter, plumb it through everything Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
* Merge "Camera: Remove RAW_SENSOR in favor of RAW16"Eino-Ville Talvala2015-02-202-2/+2
|\
| * Camera: Remove RAW_SENSOR in favor of RAW16Eino-Ville Talvala2015-02-192-2/+2
| | | | | | | | Change-Id: I69ca24c69f58be958efdef300b127401d2b2e880
* | camera: implement flashlight controlChien-Yu Chen2015-02-123-2/+55
|/ | | | | | | | 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
* am 81898637: am 16e8d463: Merge "camera2: fix various BpCameraDeviceUser ↵Eino-Ville Talvala2015-02-031-4/+4
|\ | | | | | | | | | | | | methods to return correct result." * commit '8189863774bd479f0060bbe1e4ce74dadcfc55c3': camera2: fix various BpCameraDeviceUser methods to return correct result.
| * camera2: fix various BpCameraDeviceUser methods to return correct result.John Lin2015-02-031-4/+4
| | | | | | | | | | | | | | | | - submitRequest*(): res is the request ID and not always equals to NO_ERROR. - cancelRequest() and flush(): the result of reading last frame number should be put in resFrameNumber, not in res. Change-Id: Ic81c58f4ac14c05b3db4bdc5c99f48d00665d3fc Signed-off-by: John Lin <jolin@mozilla.com>
* | am ffa3e71e: am bc0f452b: Merge "Camera2: Fix CameraParameters parse ↵Ruben Brunk2014-11-211-0/+5
|\ \ | | | | | | | | | | | | | | | | | | segfault." into lmp-mr1-dev * commit 'ffa3e71e47215b68fe4ae0b7a3f976db648d63d3': Camera2: Fix CameraParameters parse segfault.
| * \ Merge "Camera2: Fix CameraParameters parse segfault." into lmp-mr1-devRuben Brunk2014-11-211-0/+5
| |\ \
| | * | Camera2: Fix CameraParameters parse segfault.Ruben Brunk2014-11-201-0/+5
| | | | | | | | | | | | | | | | | | | | Bug: 18331142 Change-Id: I41feec93f753f97b3e6bf963deb4a42b73406421
* | | | am c2d88d0b: am f4ea51fd: Merge "camera2: fix an error reading a NULL ↵Chien-Yu Chen2014-11-211-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | string" into lmp-mr1-dev * commit 'c2d88d0b1571c11187e32b94e281ded17606070f': camera2: fix an error reading a NULL string
| * | | camera2: fix an error reading a NULL stringChien-Yu Chen2014-11-201-3/+3
| |/ / | | | | | | | | | | | | | | | | | | Handle the case where the surface name isn't set. Bug: 10461464 Change-Id: I3ee233a7a5f6489513e6d87241cda2aaefbfd43b
* | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-1710-27/+27
|\ \ \ | | |/ | |/| | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1710-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | | am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder() calls on ↵Eino-Ville Talvala2014-11-111-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | NULL interfaces" * commit '7b28e4e709fcc90f9ca5ca987e2d4e8c05d1a731': Camera: Guard against asBinder() calls on NULL interfaces
generated by cgit v1.1 at 2024-04-29 09:26:16 +0000