summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
* Snap: CaptureModule: check if ZSL is supported before using itcodeworkx2018-01-271-30/+28
| | | | Change-Id: Ifde34ce367ceeb19ad71bcff0c4518d578bb52a5
* Camera2: Remove CAF video duration codeMichael Bestas2018-01-261-0/+4
| | | | Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
* Revert "SnapdragonCamera: Forbid volume key can take picture"Michael Bestas2018-01-261-5/+1
| | | | | | This reverts commit e73e717b8be1ba834161914af4debc61c1feb8be. Change-Id: Iee719f34f6016f89ec0bb1c078bfa25c2f718436
* Snapdragon: Add bokeh enable options in devzhuw2018-01-031-1/+55
| | | | | | | | | | add bokeh enable options in dev. value: true->enable false->disable blur->enter int value Change-Id: I4e69a5371b60ce55dee2468634b1e14956811f22 CRs-Fixed: 2164757
* Add SWITCH MODEjinwu2018-01-031-18/+57
| | | | | | | When using switch camers by id in Dev Option,add this mode to avoid conflict camera ids issue. Change-Id: Ib0bef784648c0b76a5cb122eaed9859d724a899f
* SnapdragonCamera:fix multi camera switchjunjiez2018-01-031-17/+32
| | | | | | | | | | 1.fix video size lost in logical camera. 2.fix FC by enable zoom. 3.fix FC by touch focus. 4.When opening camera returns error, then clean up the camera with close(). Change-Id: I50fdb2e04df8fcf7d5a09e248b6dc523afba6125
* SnapdragonCamera:support multi camera switchjunjiez2018-01-031-8/+39
| | | | | | | add a new option in dev options to swtich camera by camera Id. Change-Id: Ieeb6f462024c3b155dc5fb532fd737313b9904de
* Merge "SnapdragonCamera: Support HFR 60 and 90 fps" into camera.lnx.3.0-devCamera Software Integration2017-09-201-1/+3
|\
| * SnapdragonCamera: Support HFR 60 and 90 fpsWeijie Wang2017-09-141-1/+3
| | | | | | | | | | | | Support HFR 60 and 90 fps Change-Id: Ib615196e691782ee6d595d5216f2966cee284a9c
* | SnapdragonCamera: Complete the function of QCFAxianming wang2017-09-071-7/+33
|/ | | | | | | | Add support for quadraCFA in HAL3, and Complete the function of QCFA. CRs-Fixed: 2104228 Change-Id: I5ae17d1af3fc433402d0f183c48baf7488768328
* Merge "Revert "SnapdragonCamera: Fix black screen on preview when switch ↵Camera Software Integration2017-08-031-10/+1
|\ | | | | | | camera"" into camera.lnx.3.0-dev
| * Revert "SnapdragonCamera: Fix black screen on preview when switch camera"Weijie Wang2017-07-261-10/+1
| | | | | | | | | | | | This reverts commit 496cc1548342f86e54fa22590f98a5794cdd71ad Change-Id: I16dd25758305d6f8ed9b4a69b65fa9a74a764c78
* | SnapdragonCamera: Add ZSL in HAL modeWeijie Wang2017-07-251-19/+57
|/ | | | | | Add ZSL in HAL mode Change-Id: Ifa803c970cfc559723e3599821b74cc8584782a2
* SnapdragonCamera: refactor captureStillPictureWeijie Wang2017-07-211-129/+144
| | | | | | Split captureStillPicture into multiple smaller methods Change-Id: I0ebc9625be880539f7c0c1d68350c093616205ad
* Merge "SnapdragonCamera: Add setprop WIDTHxHEIGHT for preview size support" ↵Camera Software Integration2017-07-201-38/+17
|\ | | | | | | into camera.lnx.3.0-dev
| * SnapdragonCamera: Add setprop WIDTHxHEIGHT for preview size supportqimengp2017-07-191-38/+17
| | | | | | | | | | | | | | Modify the setprop from set int to string to adapt more requirement Change-Id: If961869951c20125cafa7d61ded74f8166faaa80 CRs-Fixed: 2070387
* | Merge "SnapdragonCamera: Add vendor tag util" into camera.lnx.3.0-devCamera Software Integration2017-07-201-23/+7
|\ \ | |/ |/|
| * SnapdragonCamera: Add vendor tag utilWeijie Wang2017-07-131-23/+7
| | | | | | | | | | | | Check if the tag is available before apply the settings Change-Id: Ic0242b8aa7711ad230f3aba9e30d5da61d188fe5
* | SnapdragonCamera: Fix FC when mediarecorder start occur errormingwax2017-07-131-23/+12
| | | | | | | | | | | | | | | | MediaRecorder.start method should be before the hideUIwhileRecording. Adjust the logic for starting video. CRs-Fixed: 2072609 Change-Id: Ie48f8ebc4bfe3385604d4095d8ff02029c26968b
* | SnapdragonCamera: Support preview setprop for videoWeijie Wang2017-07-031-19/+25
|/ | | | | | | There is preview size setprop for camera but the same setprop was not used by video preview,so made a change to support video preview too Change-Id: I2e774f9302a392f6cc382f7e75a8901a0ce15a9a
* SnapdragonCamera: Selfie Mirror didn't work when 3rd-party app callweijiew2017-05-261-5/+3
| | | | | | | RootCause: image is mirror twice when 3rd-party app call. Change-Id: I49cabbbc21983f2a18fa6d1416133d47fe60b34f CRs-Fixed: 2052668
* Merge tag 'camera.lnx.2.0-00015' into camera.lnx.3.0-devCamera Software Integration2017-05-191-2/+4
|\ | | | | | | | | | | Merge tag 'camera.lnx.2.0-00015' into camera.lnx.3.0-dev Change-Id: If0d8ae32c19e1292214bfe8dbb45a9582eda8829
| * Merge "SnapdragonCamera: Only support max picture size" into camera.lnx.2.0-devCamera Software Integration2017-05-111-2/+4
| |\
| | * SnapdragonCamera: Only support max picture sizeweijiew2017-05-051-2/+4
| | | | | | | | | | | | | | | | | | Only support max picture size Change-Id: Ia7739400029cc5a1db9d128f000a1482789dfd75
| * | SnapdragonCamera: fix crash in HFRjunjiez2017-05-021-2/+7
| |/ | | | | | | | | | | | | | | | | | | ConstrainedHighSpeedCaptureSession only supports some particular sizes, unsupported sizes will cause crash. When HFR is enabled, using video siez as preivew size to avoid crash. Change-Id: I9dad9690c2fc5a3fd25b758a7c3e0d892d63e35b CRs-Fixed: 2038913
* | Merge "SnapdragonCamera: fix crash in HFR" into camera.lnx.3.0-devLinux Build Service Account2017-05-161-2/+7
|\ \
| * | SnapdragonCamera: fix crash in HFRjunjiez2017-05-021-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConstrainedHighSpeedCaptureSession only supports some particular sizes, unsupported sizes will cause crash. When HFR is enabled, using video siez as preivew size to avoid crash. Change-Id: I9dad9690c2fc5a3fd25b758a7c3e0d892d63e35b CRs-Fixed: 2038913
* | | Merge tag 'camera.lnx.2.0-00010' into camera.lnx.3.0-devCamera Software Integration2017-05-081-6/+21
|\ \ \ | |/ / |/| / | |/ | | | | Merge tag 'camera.lnx.2.0-00010' into camera.lnx.3.0-dev Change-Id: I7e8e12e01f16093e1bda744de511c29e1ec26570
| * Merge "SnapdragonCamera: FR40621 ClearSight/DDM integrate ClearSight/DDM, ↵Linux Build Service Account2017-04-241-2/+4
| |\ | | | | | | | | | integrate Clear Sight in Camera Framework" into camera.lnx.1.0-dev.1.0
| | * SnapdragonCamera: FR40621 ClearSight/DDM integrateweijiew2017-03-081-2/+4
| | | | | | | | | | | | | | | | | | | | | ClearSight/DDM, integrate Clear Sight in Camera Framework CRs-Fixed: 1108837 Change-Id: Ibde73b15c9361294eb2e0e05967763005a4546e0
| * | SnapdragonCamera: Change max number of cameras snapcam supported to 4weijiew2017-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | Change max number of cameras snapcam supported to 4 Change-Id: Ib51cced80b28e11db8d4cc2fa6a33fbb10b3fd12 CRs-Fixed: 1108837
| * | Merge "SnapdragonCamera: Fix crash when zoom with HFR/HSR" into ↵Linux Build Service Account2017-04-011-2/+11
| |\ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| | * | SnapdragonCamera: Fix crash when zoom with HFR/HSRjunjiez2017-03-271-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When HFR/HSR enabled, current session is CameraConstrainedHighSpeedCaptureSession,need to use this kind of session to set capture request to avoid crash. Change-Id: I8a341c9d626d328cccf6492ce27bd4b50d38ec12 CRs-Fixed: 2019801
| * | | Merge "SnapdragonCamera: Add setprop to control cancel touch AF delay" into ↵Linux Build Service Account2017-04-011-1/+4
| |\ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| | * | | SnapdragonCamera: Add setprop to control cancel touch AF delayqimengp2017-03-271-1/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | persist.camera.focus_delay XXX, default is 50000 ms Change-Id: Id15b308efb20e797bed2d9956f12e332af4e6b54 CRs-Fixed: 1114799
| * | | Merge "Snapdragon: Add ZSL to Dev option" into camera.lnx.1.0-dev.1.0Linux Build Service Account2017-03-291-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Snapdragon: Add ZSL to Dev optionjunjiez2017-03-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ZSL option to develop options, when it's disabled , restart sessions and turn on ZSL Change-Id: I7a3bc2236d0bedb37cf1923763407fd4ab8ec8bd
* | | | Merge "SnapdragonCamera: Fix black screen on preview when switch camera"Linux Build Service Account2017-04-211-0/+11
|\ \ \ \
| * | | | SnapdragonCamera: Fix black screen on preview when switch cameraweijiew2017-04-181-0/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The preview is not refreshed when switch camera. Refresh preview by changing SurfaceHolder size Change-Id: Ic699f385b60f7b15719f378cd4004b0ede295ade CRs-Fixed: 2027214
* / / / SnapdragonCamera: Fix image quality of ChromaFlashjunjiez2017-04-111-1/+1
|/ / / | | | | | | | | | | | | | | | | | | When start to take picture with flash on, keep capturing until AeState becomes right. Change-Id: Id34166d44f444ddd44156921aae4c9add2efbc55
* | | Merge "SnapdragonCamera: Fix ghosting when non-zsl in VGA/QVGA size" into ↵Linux Build Service Account2017-03-241-43/+32
|\ \ \ | |/ / |/| | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix ghosting when non-zsl in VGA/QVGA sizemingwax2017-03-121-43/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (1) Increase the size of the preivewSize according to the ratio of the pictureSize. (2) Change the mVideoSnapshotSize from the mPictureSize to mVideoSize. (3) Reconstruction the getMaxPictureSizeLessThan4K method. CRs-Fixed: 1116242 Change-Id: Ic7dbab23fd0ee083cd38818fa39f4893de7c1d24
* | | Merge "SnapdragonCamera: Smile/blink/gaze detection" into camera.lnx.1.0-dev.1.0Camera Software Integration2017-03-171-5/+64
|\ \ \ | |/ / |/| |
| * | SnapdragonCamera: Smile/blink/gaze detectionjunjiez2017-03-141-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | Implement Smile/blink/gaze detection feature and add option to enable it in develop options. CRs-Fixed: 1087487 Change-Id: I3005ca9767fbe38323e86255238cd4f96f34fbe5
* | | Merge "SnapdragonCamera: Fix cancelTouchFocus only once" into ↵Camera Software Integration2017-03-111-9/+27
|\ \ \ | |/ / |/| | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix cancelTouchFocus only oncemingwax2017-03-071-9/+27
| |/ | | | | | | | | | | | | | | When the user click the screen many time for autoFocusTrigger, ensure the cancelTouchFocus only execute once. CRs-Fixed: 2005432 Change-Id: I16b027cbc42d4af2505c04d5c7ccbf1ce8487e9e
* | Merge "SnapdragonCamera: Modify ISO vender tag" into camera.lnx.1.0-dev.1.0Camera Software Integration2017-03-091-0/+16
|\ \
| * | SnapdragonCamera: Modify ISO vender tagqimengp2017-03-011-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | When apply ISO priority, remove SENSOR_EXPOSURE_TIME and SENSOR_SENSITIVITY parameters Change-Id: I39ee156f2b75ef4e9aeda23196229507f1c6cc7b CRs-Fixed: 2012117
* | | Merge "Snapdragon: Add auto HDR to Dev option" into camera.lnx.1.0-dev.1.0Camera Software Integration2017-03-091-0/+11
|\ \ \ | |_|/ |/| |
| * | Snapdragon: Add auto HDR to Dev optionjunjiez2017-03-021-0/+11
| |/ | | | | | | | | | | | | | | When auto HDR is enabled, disable ZSL, and if scene is auto, get isHdrScene from HAL and if HAL return true, apply HDS scene mode. Change-Id: Iac4eef5bf9266ba9ed4779a3b59a93a6ae3eac72