summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
* | Merge "SnapdragonCamera: Add zoom option to developer option for camera2" ↵Linux Build Service Account2017-03-061-1/+11
|\ \ | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Add zoom option to developer option for camera2weijiew2017-03-011-1/+11
| |/ | | | | | | | | | | | | | | | | For automation testing, we need a way to adjust the zoom without using the pinch gesture. Therefore, adding zoom option preference to the developer option. CRs-Fixed: 2008116 Change-Id: Ie459dbbb28051d49f8e4951d6adb112d03cf22f6
* | Merge "SnapdragonCamera: Fix live shot image stretch when recording is 4K" ↵Linux Build Service Account2017-03-061-1/+7
|\ \ | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix live shot image stretch when recording is 4Kmingwax2017-03-011-1/+7
| |/ | | | | | | | | | | | | | | | | | | (1) When the video is seted 4K UHD, the mVideoSnapshotSize should be setted the similar aspect ratio to ensure the picture which live shotted is not stretched. (2) Fixed the width and height of the panorama image CRs-Fixed: 2012167 Change-Id: I15d139c6d558923d6b4a32ee3613c44c7a974129
* | SnapdragonCamera:Fix Zoom in didn't work for the videosnapshot.pezhan2017-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | When captureVideoSnapshot, use another captureBuilder instead of mPreviewRequestBuilder without set SCALER_CROP_REGION for the captureBuilder. Add set SCALER_CROP_REGION for it. Change-Id: Ib8ae026750b3761ca6e1d346fd1c5a2b1692bfb7 CRs-Fixed: 2006333
* | SnapdragonCamera:Fix Zoom for camera and camcorder at the same time.pezhan2017-03-021-2/+3
|/ | | | | | | | | | When enter camcorder preview, the zoom value has been set the max 8x by zoom in camera preview. Need to reset the zoom value for camcorder when enter camcorder preview. Change-Id: Ie43237d755c33a468a763b5948e32233d21c444d CRs-Fixed: 2006224
* Merge "SnapdragonCamera: Increase the touch AF time." into ↵Camera Software Integration2017-02-281-1/+1
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Increase the touch AF time.qimengp2017-02-141-1/+1
| | | | | | | | | | | | | | Increase the touch AF time from 3000ms to 5000ms Change-Id: I28179adad336a47838a6f639e5082bf511cd1f15 CRs-Fixed: 1114799
* | Merge "SnapdragonCamera: fix focus failture after switch resolution" into ↵Camera Software Integration2017-02-281-0/+15
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: fix focus failture after switch resolutionjunjiez2017-02-201-0/+15
| |/ | | | | | | | | | | | | | | Need to cancel touch focus when activity paused to avoid in wrong focus mode in the next lunch. Change-Id: I8e711b520f3b0f4042ef8af5197c1a4b321b6c0c CRs-Fixed: 2006407
* | Merge "SnapdragonCamera: Fix ISO auto don`t work in pro mode" into ↵Camera Software Integration2017-02-281-2/+2
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix ISO auto don`t work in pro modemingwax2017-02-201-2/+2
| |/ | | | | | | | | | | | | | | SnapdragonCamera needs to set ISO with 0 value when in auto mode, instead of NULL. CRs-Fixed: 2008928 Change-Id: I5fd39a743c3ae7286ade4c810d7d4e15714293e5
* / SnapdragonCamera: Fix a green line in BestPicture and Ubifocusmingwax2017-02-221-1/+1
|/ | | | | | | | When mStride > mWidth, use the whole yuv bytebuffer to save JPG. Add properties to control whether to print log. CRs-Fixed: 1101620 Change-Id: I18cd27de8be542fc9440be6071ee55149b598ac5
* Merge "SnapdragonCamera: Fix HDR+nHDR generates dark images" into ↵Linux Build Service Account2017-01-301-1/+2
|\ | | | | | | camera.lnx.1.0-dev.1.0