summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix force close when TAF before repeatingzhuw2019-04-231-0/+1
| |/ | | | | | | | | | | | | | | init mOriginalCropRegion when open camera to avoid this. Change-Id: I3f086475cd8bcdf0087ca20993403e698dd87d79 CRs-Fixed:2426830
* / fix force closed if start recording before snapshot finishedzhuw2019-04-231-1/+1
|/ | | | | | | do not allow recording before snapshot finished Change-Id: Idd412b9ab2cba3b867f9d2842885261a24d97d09 CRs-Fixed:2425049
* Merge "SnapdragonCamera: Add get AE/AF state in onCaptureProgressed" into ↵Linux Build Service Account2019-04-181-0/+1
|\ | | | | | | camera-SnapdragonCamera.lnx.2.0
| * SnapdragonCamera: Add get AE/AF state in onCaptureProgressedxianming wang2019-03-111-0/+1
| | | | | | | | | | | | | | | | (1) Add get AE/AF state in onCaptureProgressed(partial meta). (2) Fix NullPointerException when mPreferenceGroup is NULL. CRs-Fixed: 2401109 Change-Id: I2c2828d9a6d93c50457eb1d1a35f3dbd0e08ff4d
* | Merge "SnapdraongCamera:Fix longshot count in nZSL" into ↵Linux Build Service Account2019-04-181-9/+6
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdraongCamera:Fix longshot count in nZSLjunjiez2019-04-111-9/+6
| |/ | | | | | | | | | | | | | | | | Send the max longshot count of capture requests in a request list to avoid sending more requests than expected. Change-Id: Ie749f1605c171752b0610071e3b8e9f3ec561156 CRs-Fixed: 2431713
* | Merge "Checking session is not null before call abortCapture" into ↵Linux Build Service Account2019-04-181-2/+2
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | Checking session is not null before call abortCapturejinwu2019-03-221-2/+2
| |/ | | | | | | Change-Id: I54132e4d5da6d875874aa350fd84b89010dbeb88
* / SnapdragonCamera: Fix mCurrentSession NullPointer when stopRecordingxianming wang2019-03-111-2/+4
|/ | | | | | | | Fix mCurrentSession NullPointerException when stopRecording call abortCaptures. CRs-Fixed: 2411251 Change-Id: I831d5eeb86219480aee4299eb681a94f83054fc8
* Merge "Increase burst requests" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2019-03-081-2/+2
|\
| * Increase burst requestsjinwu2019-02-121-2/+2
| | | | | | | | | | | | | | Make it 40 requests one time in burst, so fps will be more closer to the setting number. Change-Id: Icd05be3aea916a9163328f893a9a7510b3823f0e
* | Catch the exception when stop recordingjinwu2019-02-181-0/+2
|/ | | | Change-Id: Ifb2c7c5c9f172d3b1bbad8419c944241baf7228d
* Merge "Fix issue of that session isn't created" into ↵Sridhar Gujje2019-02-041-1/+1
|\ | | | | | | camera-SnapdragonCamera.lnx.2.0
| * Fix issue of that session isn't createdjinwu2019-01-231-1/+1
| | | | | | | | | | | | | | When launch snapcam and pause quickly, then session isn't created but still call abortCaptures will FC by NULL POINTER. Change-Id: If0f1facf5f1770648b18400454c8fd5e85bba559
* | Merge "fix Macro Auto Focus mode is not working" into ↵Sridhar Gujje2019-02-041-4/+5
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | fix Macro Auto Focus mode is not workingzhuw2019-01-221-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | APP will trigger TAF with one request. Then repeating with AUTO mode no matter which option is selected But APP will repeating selected af mode after 5sec later(time out). Change-Id: Ibbd8ccef54d87421d9aacfacefc0e07fa506843c CRs-Fixed:2379642
* | | Merge "fix stop failed issue when repeating start/stop recording" into ↵Sridhar Gujje2019-02-041-6/+7
|\ \ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | | fix stop failed issue when repeating start/stop recordingzhuw2019-01-221-6/+7
| | |/ | |/| | | | | | | | | | | | | | | | don't call mediarecorder.stop before start Change-Id: Idfbeaceb0147254bcf6fd93a1ef8da2370ed769f CRs-Fixed:2373849
* | | Merge "fix force close when change color effect during HFR recording" into ↵Sridhar Gujje2019-02-041-2/+9
|\ \ \ | | |/ | |/| | | | camera-SnapdragonCamera.lnx.2.0
| * | fix force close when change color effect during HFR recordingzhuw2019-01-221-2/+9
| |/ | | | | | | | | | | | | when setting changed, use setRepeatingBurst for HFR case Change-Id: I0452fb962db1843a9d04faf767b88bc1b687c8b9 CRs-Fixed:2382544
* | Merge "SnapdraongCamera:Fix HEIF longshot" into camera-SnapdragonCamera.lnx.2.0Sridhar Gujje2019-02-041-18/+30
|\ \
| * | SnapdraongCamera:Fix HEIF longshotjunjiez2019-01-171-18/+30
| |/ | | | | | | | | | | | | | | | | | | Change the max count of images in one file to 20 to avoid timeout issue and update heif output stream when one longshot is done. Change-Id: I1c1fdc6f6c4d34a6447c7833c8094ba6c8d1812b CRs-Fixed: 2382360
* | Merge "SnapdraongCamera:Fix HAL-ZSL flash" into camera-SnapdragonCamera.lnx.2.0Sridhar Gujje2019-02-041-1/+2
|\ \
| * | SnapdraongCamera:Fix HAL-ZSL flashjunjiez2019-01-241-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | The capture result of preview repeating request has delay, need to discard the preview capture result when the AE lock is still true after unlock focus to avoid chosing HAL-ZSL when flash is needed. Change-Id: I7b478c11be93fa12fdb4773dc57ec91a2aaf6306 CRs-Fixed: 2372219
* / SnapdragonCamera: Enable ShutterButton when HDR receive imagexianming wang2019-01-181-0/+14
|/ | | | | | | Enable ShutterButton when HDR is ON and receive the image. CRs-Fixed: 2378839 Change-Id: I950d3d5d96d2972a5be446596220dcb9ddd4fbd7
* Merge "SnapdragonCamera: Set NOISE_REDUCTION_MODE_FAST when disable MFNR" ↵Linux Build Service Account2019-01-171-1/+1
|\ | | | | | | into camera-SnapdragonCamera.lnx.2.0
| * SnapdragonCamera: Set NOISE_REDUCTION_MODE_FAST when disable MFNRxianming wang2019-01-061-1/+1
| | | | | | | | | | | | | | Set NOISE_REDUCTION_MODE_FAST when disable MFNR. CRs-Fixed: 2369613 Change-Id: I79abd5c8fe3454f49bd0d0b7b06c76c306e89be4
* | Merge "SnapdragonCamera: Add abortCaptures for flush" into ↵Linux Build Service Account2019-01-171-2/+60
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Add abortCaptures for flushxianming wang2019-01-061-2/+60
| |/ | | | | | | | | | | | | | | | | | | | | Add abortCaptures for flush. (1) when exit app. (2) when switch cameraID. (3) start recording before closePreview session. (4) stop recording except enable EIS. CRs-Fixed: 2349737 Change-Id: I4546fbfefa3ffa4bcec688a6b5c6eea24045f232
* | Merge "SnapdragonCamera: Set preview 30fps for different targets" into ↵Linux Build Service Account2019-01-111-6/+21
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Set preview 30fps for different targetsxianming wang2018-12-281-6/+21
| | | | | | | | | | | | | | | | | | | | | Set preview 30fps for low tier target, and set preview 60 fps for high tier target. Change-Id: Ib2806474e0c057210e938b14408836c334e3d0c9
* | | Merge "SnapdraongCamera:HEIF improvement" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2019-01-111-24/+25
|\ \ \
| * | | SnapdraongCamera:HEIF improvementjunjiez2018-12-211-24/+25
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.Remove JPEG output config when HEIF is enabled. 2.Close heifWrite after unlock focus to ensure the data is arrived. CRs-Fixed: 2371414 Change-Id: Ic72630a690cf2f5af9bcafaee1d5bf013b66cbe5
* | | Merge "SnapdraongCamera:Fix RAW capture" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2019-01-111-0/+1
|\ \ \ | |_|/ |/| |
| * | SnapdraongCamera:Fix RAW capturejunjiez2018-12-261-0/+1
| |/ | | | | | | | | | | | | | | | | 1.close raw image after it's saved to avoid image leak. 2.Disable longshot when RAW is enabled. Change-Id: I8e5896e1dc9ba497fbffe95e694e02e7b8abc289 CRs-Fixed: 2372398
* | Merge "It recording failed, then remove video file first" into ↵Linux Build Service Account2019-01-041-2/+1
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | It recording failed, then remove video file firstjinwu2018-12-201-2/+1
| |/ | | | | | | Change-Id: I49b2ffd5690ab511916cd2f27d7434f0027c78d8
* | Merge "SnapdraongCamera:Fix NullPointerException" into ↵Linux Build Service Account2019-01-041-1/+2
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdraongCamera:Fix NullPointerExceptionjunjiez2018-12-201-1/+2
| |/ | | | | | | | | | | | | | | | | Check if the session is null in CameraCaptureSession.StateCallback to avoid NP. Change-Id: I0098857d4a368fecc7a633c75c85cb41277c168d CRs-Fixed: 2364431
* | Merge "SnapdragonCamera: Remove the previewBuilder callback" into ↵Linux Build Service Account2019-01-041-0/+10
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Remove the previewBuilder callbackxianming wang2018-12-191-0/+10
| |/ | | | | | | | | | | | | | | Add Tag for previewBuilder, in order to does not incrementAndGet mNumFramesArrived in mLongShotCallBack method. CRs-Fixed: 2350721 Change-Id: I51150b22fbc0aba869520d04b5e0dd85c0a00140
* / SnapdraongCamera:Fix MediaRecorder releasejunjiez2018-12-201-2/+2
|/ | | | | | | | Catch the RuntimeException when release MediaRecorder to avoid app FC. Change-Id: I4d4616ad20b185655f0d9a32c41ed5a2c02f23dd CRs-Fixed: 2356456
* Merge "SnapdragonCamera: Set burst shotFps controlled by setprop" into ↵Abhijit Trivedi2018-12-191-6/+5
|\ | | | | | | camera-SnapdragonCamera.lnx.2.0
| * SnapdragonCamera: Set burst shotFps controlled by setpropxianming wang2018-12-141-6/+5
| | | | | | | | | | | | | | | | Set burst shotFps controlled by setprop. The prop is "persist.sys.camera.burst.shot.fps", the default value is false. CRs-Fixed: 2363720 Change-Id: Ia24e6da153728ac94e9472aec407b288d4f70b7c
* | Merge "SnapdragonCamera: Add sound.load when init SoundPlayer" into ↵Abhijit Trivedi2018-12-191-11/+12
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Add sound.load when init SoundPlayerxianming wang2018-12-141-11/+12
| |/ | | | | | | | | | | | | Add Sound.load when initialization SoundPlayer. CRs-Fixed: 2357307 Change-Id: Id94b50362a8774e5656b94dae703186f9fe6d889
* | Merge "fix force close when TAF before session configed" into ↵Abhijit Trivedi2018-12-191-1/+2
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | fix force close when TAF before session configedzhuw2018-12-141-1/+2
| |/ | | | | | | | | | | | | don't trigger TAF before session configed Change-Id: Idfa19338b84fb46bb0ea37300d271f6357b0da11 CRs-Fixed:2364579
* | Merge "Fix reconfig stream in liveshot of HFR/HSR" into ↵Abhijit Trivedi2018-12-191-0/+4
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | Fix reconfig stream in liveshot of HFR/HSRjinwu2018-12-141-0/+4
| |/ | | | | | | | | | | Set fps range in liveshot request to avoid reconfig. Change-Id: I54fbe95632575c556ed5caa2c57975e6b9c95a52