summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware/camera2
Commit message (Collapse)AuthorAgeFilesLines
* camera2 legacy: Allow HDR processing to take a whilenadlabak2016-03-231-1/+4
| | | | Change-Id: Ifc471d5a79299c40b40c2ea6cb457f6e3fd31338
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-113-7/+18
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * Merge "Camera: codegen doc update" into mnc-devEino-Ville Talvala2015-12-041-5/+12
| |\ | | | | | | | | | | | | | | | | | | am: 69c5e7143d * commit '69c5e7143dd308e8db9b6055b428b7ad3964c1ff': Camera: codegen doc update
| | * Camera: codegen doc updateYin-Chia Yeh2015-11-301-5/+12
| | | | | | | | | | | | | | | Bug: 25427163 Change-Id: I9e552a7ad365f2a45e5ebb74234b9dfb8eb1225c
| * | Camera: Documentation updatesEino-Ville Talvala2015-11-122-2/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | am: d8407271ff * commit 'd8407271ffa83d27e9a524f485a0799e422e1fd6': Camera: Documentation updates
| | * Camera: Documentation updatesEino-Ville Talvala2015-11-112-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clarify hardware.camera feature being only for the back camera - Clarify what setting a CaptureRequest field to null does - Use preCorrectionActiveArray instead of activeArray in list of possible raw output sizes - Clarify length of GPS processing field for camera1 API Bug: 24540625 Bug: 23908116 Bug: 23051627 Bug: 17345901 Change-Id: Iaf11fdf626268cf30f66b3628153ec3ac770c4f4
* | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-0510-9/+131
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: cmds/bootanimation/BootAnimation.cpp core/java/android/accounts/AccountManager.java core/java/android/app/AppOpsManager.java core/java/android/os/PowerManagerInternal.java core/java/android/os/storage/IMountService.java core/java/android/provider/Settings.java core/java/com/android/internal/widget/ILockSettings.aidl core/res/res/values-mcc204-mnc12/config.xml core/res/res/values-mcc219-mnc02/config.xml core/res/res/values-mcc730-mnc07/config.xml core/res/res/values/config.xml core/res/res/values/symbols.xml packages/SystemUI/res/values/config.xml packages/SystemUI/src/com/android/systemui/doze/DozeService.java packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java services/core/java/com/android/server/LocationManagerService.java services/core/java/com/android/server/am/ActivityManagerService.java services/core/java/com/android/server/pm/PackageManagerService.java services/core/java/com/android/server/power/PowerManagerService.java telecomm/java/android/telecom/Phone.java telephony/java/android/telephony/CarrierConfigManager.java telephony/java/android/telephony/RadioAccessFamily.java telephony/java/android/telephony/ServiceState.java telephony/java/android/telephony/SignalStrength.java telephony/java/android/telephony/TelephonyManager.java telephony/java/com/android/ims/ImsCallProfile.java telephony/java/com/android/ims/ImsReasonInfo.java telephony/java/com/android/ims/ImsSuppServiceNotification.aidl telephony/java/com/android/ims/ImsSuppServiceNotification.java telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl telephony/java/com/android/internal/telephony/RILConstants.java Change-Id: I99c6edb8e25a77145b5adef97d0d55bfbe676959
| * | am a636be6c: Camera: fix wrong FULL feature stringYin-Chia Yeh2015-10-071-1/+1
| |\ \ | | |/ | | | | | | | | | * commit 'a636be6c9a8a9192f72a111c2b3084a226d37b7e': Camera: fix wrong FULL feature string
| | * Camera: fix wrong FULL feature stringYin-Chia Yeh2015-10-061-1/+1
| | | | | | | | | | | | | | | Bug: 24678065 Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
| * | am 2813b0fa: Camera2: Update video stabilization API doc.Jianing Wei2015-10-012-2/+22
| |\ \ | | |/ | | | | | | | | | * commit '2813b0fae99fed1096dc23c3899e223459a54cec': Camera2: Update video stabilization API doc.
| | * Camera2: Update video stabilization API doc.Jianing Wei2015-09-292-2/+22
| | | | | | | | | | | | | | | Bug: 23353979 Change-Id: I781006d1b6ebbdf522ebbf6acc35b2062aff76b6
| * | am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-devChien-Yu Chen2015-08-261-5/+8
| |\ \ | | |/ | | | | | | | | | * commit 'e4c3ff2f50dd8126bee379dd3b078ecf36d6a294': Camera: Update for reprocess session
| * | am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable ↵Eino-Ville Talvala2015-08-241-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | devices" into mnc-dev * commit '2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd': Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
| * \ \ am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating ↵Eino-Ville Talvala2015-08-221-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGL surfaces" into mnc-dev * commit '08b12dfba630659601972f0d857b6580fdae4313': Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
| * \ \ \ am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-devEino-Ville Talvala2015-08-223-21/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7dde2e89ec9a8c0ce5460d4f57d1e561f16520f': Camera: Fix depth documentation issues
| * | | | | Camera2: Handle surface size changeChien-Yu Chen2015-08-181-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When comparing if two OutputConfigurations are equal, also check the width, height, format, dataspace when the output configurations were created. With this, CameraDeviceImpl knows that the surface has changed sizes and will reconfigure the stream. Bug: 12250682 Change-Id: Ie5965d242b2017b87a76d26cdc2f6b700082e002
| * | | | | Merge "Add experimental camera session prepare API." into mnc-dr-devRuben Brunk2015-08-176-0/+86
| |\ \ \ \ \
| | * | | | | Add experimental camera session prepare API.Ruben Brunk2015-08-146-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18949148 Change-Id: I35fde35436ae5bebab3c912243e621285307c211
* | | | | | | Unset frame listener before tearing down GLThreadManager.Danny Baumann2015-10-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise might lead to messages being delivered to the then dead mGLHandlerThread via RequestThreadManager.mPreviewCallback -> GLThreadManager.queueNewFrame(). Change-Id: I60001149787c584bfee88c961f1e07cdb8cf3927
* | | | | | | Camera2 legacy: retry EGL config without EGL_RECORDABLE_ANDROIDMichael Gernoth2015-10-161-0/+14
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some older blobs don't support EGL_RECORDABLE_ANDROID and return no configuration when this attribute is present. Retry eglChooseConfig without it in this case. This fixes the flashlight for devices affected by this and doesn't break camera-functionality. Change-Id: Ic479231744343567233edaa1cccea7bdaafaa14f
* | | | | | Merge "Camera: Update for reprocess session" into mnc-devChien-Yu Chen2015-08-261-5/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Camera: Update for reprocess sessionChien-Yu Chen2015-08-251-5/+8
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that some devices may not support submitting multiple outputs in a single reprocess capture requests. Remove the guaranteed reprocess session configurations that are less common and may not be supported by all devices. Bug: 23422291 Change-Id: I1c869612e9a83ef480113ca2628f68511a150b64
* | | | | Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into ↵Eino-Ville Talvala2015-08-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | mnc-dev
| * | | | Camera2: Remove filtering for non-BURST_CAPTURE-capable devicesEino-Ville Talvala2015-08-241-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Devices that do not support the BURST_CAPTURE capability do not get the split resolution lists. However, one spot in the stream configuration map enumeration did not guard against this properly. As a result, the category of devices that are not-BURST-CAPABLE and do list resolutions that operate at a 'slow' (<= 20fps) rates cause an assert to fire from an apparently-inconsistent size list. Guard the filtering correctly, to correctly support such devices. Bug: 23489536 Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701
* | | | Merge "Camera2: Legacy: Lock down surface sizes before creating EGL ↵Eino-Ville Talvala2015-08-221-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | surfaces" into mnc-dev
| * | | Camera2: Legacy: Lock down surface sizes before creating EGL surfacesEino-Ville Talvala2015-08-211-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | This ensures that sizes don't change after being initially inspected, and/or stale size information isn't reused incorrectly. Bug: 22092273 Change-Id: I5b26ea53977da4c1412e476d06d94aa791846393
* | | Camera: Fix depth documentation issuesEino-Ville Talvala2015-08-193-21/+34
|/ / | | | | | | | | | | | | | | | | - Correct spelling of quaternion - LENS_INTRINSIC_CALIBRATION and LENS_RADIAL_DISTORTION were not linkifying correctly Bug: 23360503 Change-Id: I9c5acc0087d7115548b75ccfa1bc1eb1866557b2
* | Camera2: Add camera type to getNumberOfCameras.Eino-Ville Talvala2015-08-141-1/+4
|/ | | | | | | | Do not list strange cameras in old API; ensure new API gets all cameras. Bug: 23194168 Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
* Camera: Fix framework bugs with DEPTH-only camera devicesEino-Ville Talvala2015-08-111-5/+16
| | | | | | | | Mostly due to no standard stream configurations being defined, and for the correct overrides for DEPTH_POINT_CLOUD format. Bug: 20537722 Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
* Make vendor keys visible in Camera2 java APIs.Ruben Brunk2015-07-312-0/+36
| | | | | | | | | | | | | - Add vendor keys to getKeys() calls for CameraCharacteristics, CaptureRequest, and CaptureResult. - Vendors can specify whether custom keys show up by listing visible keys in the REQUEST_AVAILABLE_RESULT_KEYS field. - Vendor key types are always treated as a primitive (or Rational) array type corresponding to one of the valid types for a camera metadata entry. Bug: 22067625 Change-Id: I6e7dd3db7a8bf533c2ec15ff69ca38824134e971
* Merge "Camera2: Update FAST mode for EE and NR" into mnc-devChien-Yu Chen2015-07-173-13/+19
|\
| * Camera2: Update FAST mode for EE and NRChien-Yu Chen2015-07-153-13/+19
| | | | | | | | | | | | | | | | FAST for EE/NR modes may be the same as OFF for devices whose EE/NR will slow down the capture rate. Bug: 22486061 Change-Id: I162dc27a6ba6838fbbc1077dd346f4ff9bbacc43
* | Camera2: Add hidden experimental tearDown methodEino-Ville Talvala2015-07-166-0/+90
| | | | | | | | | | Bug: 18949148 Change-Id: I6264d95a26ebf51cce6114c9a86b9561f7c60ab5
* | Merge "Camera: clarify largest JPEG dimension expectation" into mnc-devYin-Chia Yeh2015-07-141-2/+18
|\ \
| * | Camera: clarify largest JPEG dimension expectationYin-Chia Yeh2015-07-081-2/+18
| | | | | | | | | | | | | | | | | | | | | Codegen doc update. Bug: 22295208 Change-Id: I06f17579915bfaa640a26a42f0ce0b7549e35d3c
* | | Merge "Camera: Reconnect after camera service crashes" into mnc-devChien-Yu Chen2015-07-141-8/+47
|\ \ \ | | |/ | |/|
| * | Camera: Reconnect after camera service crashesChien-Yu Chen2015-07-131-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | Schedule a reconnection after camera service crashes if any client registered a camera availability callback or torch status callback. Bug: 407755 Change-Id: Iabe0bf713863898ca468cff59d4c97c66a802630
* | | Camera metadata: fix typos.Zhijun He2015-07-111-5/+5
|/ / | | | | | | | | Bug: 22417740 Change-Id: I871b990da43132f4967faf7ee23a9a2d962c4320
* | Camera2: Reorganize high-speed recording API slightlyEino-Ville Talvala2015-07-1012-329/+647
| | | | | | | | | | | | | | | | - Split off distinct high speed capture session class from base capture session - Move createHighSpeedRequestList to CameraConstrainedHighSpeedCaptureSession Bug: 21664295 Change-Id: I67d705fdeee1eaa6e5e3e1416771d5d0df642843
* | Camera: Enforce ZERO_SHUTTER_LAG modeChien-Yu Chen2015-07-082-3/+9
| | | | | | | | | | | | | | | | | | | | Camera devices that support YUV or PRIVATE reprocessing must list ZERO_SHUTTER_LAG mode in android.edge.availableEdgeModes and android.noiseReduction.availableNoiseReductionModes, and it must be the default mode for ZSL template. Bug: 22266686 Change-Id: I4728b2261760d11d695e9e364d8a72b3b2d31284
* | Merge "Camera2: implement Key.toString()" into mnc-devChien-Yu Chen2015-07-073-0/+42
|\ \
| * | Camera2: implement Key.toString()Chien-Yu Chen2015-07-073-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | Implement toString() for CameraCharacteristics.Key, CaptureResult.Key, and CaptureRequest.Key. Bug: 22279124 Change-Id: Ib1076e3f6d7bcbffbb148a7a01f72133daccebb8
* | | Merge "ImageWriter: Exception when Surface is abandoned" into mnc-devChien-Yu Chen2015-07-071-2/+3
|\ \ \
| * | | ImageWriter: Exception when Surface is abandonedChien-Yu Chen2015-07-061-2/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throw IllegalStateException when queueing or dequeueing an image if the input surface is already abandoned by the consumer. Also fix a crash when planes are not initialized when closing ImageWriter. Bug: 22279111 Change-Id: I8301920d64a53c45b29e947e52ff323733abbf16
* | | Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancementEino-Ville Talvala2015-07-073-4/+97
|/ / | | | | | | | | | | | | | | | | | | | | | | | | This mode splits processing quality based on stream resolution, to enable ZSL operation where low-resolution (preview/recording) streams require more processing since they are immediately user-visible, while the high-resolution intermediate ZSL stream should have minimal/no processing since it will be reprocessed into final quality when necessary Bug: 22266686 Change-Id: Ib41102b66b07d61a099f021f8c6251f28c62686f
* | Merge "Camera2: Remove FREEFORM cropping requirement from FULL" into mnc-devEino-Ville Talvala2015-07-061-4/+5
|\ \ | |/ |/|
| * Camera2: Remove FREEFORM cropping requirement from FULLEino-Ville Talvala2015-06-301-4/+5
| | | | | | | | | | | | | | To enable FULL to cover high-resolution devices better. Bug: 22207844 Change-Id: I74a80071c77a2bb65d0731604adea9b9e937b361
* | Merge "camera2: Fix ABI for new tags." into mnc-devRuben Brunk2015-07-011-64/+64
|\ \ | |/ |/|
| * camera2: Fix ABI for new tags.Ruben Brunk2015-07-011-64/+64
| | | | | | | | | | Bug: 22229158 Change-Id: If8dc8524258b59b45e56ce54f451c59b9c7e79e2
* | Merge "Camera2: Remove references to sync.frameNumber" into mnc-devChien-Yu Chen2015-06-262-27/+3
|\ \