summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* add "switch camera by id" option in dev-optionzhuw2019-04-021-0/+7
| | | | | | add related resource and control logic for this option Change-Id: Iaec2b11ddb1ac80f7c7a2d116018dbbdfb903fc7
* fix monkey test error issue2zhuw2019-03-061-6/+19
| | | | Change-Id: I289080c209c3b413beb31b5188657da3b90d9525
* FR: add new layout for re-design camera UIzhuw2019-02-241-526/+625
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version_017 add module switcher for module switcher add smart settings finish video photo, RTB, SAT ProMode module fix manual focus distance error and iso setting error no response to click event before session config done switch to photo mode if create session failed for video fix shutter icon error when open camera with video intent and capture intent remove force AUX if no multi camera fix closing costs too much time issue remove flash icon in Promode set flash mode to OFF when close session fix issues during video intent mode do not repeating again when stop recording to make sure last frame remove some refference of camerainfo in camera2 avoid clicking too fast to switch mode fix issues in video intent mode flash_mode set to OFF in promode fix TAF issues during video preview remove the behavior of hide and show surface add new gesture to switch front/back camera fix issue: video preview stretched when switching from photo RTB type change to 1 and SAT is 2 init mCameraId[] in method init() select the first camera id in one mode(RTB,SAT) rebase on 027 Change-Id: I7c6de86fabe0a27f0e47fb7e2362d210de2d722d
* Merge "Fix issue of that session isn't created" into ↵Linux Build Service Account2019-02-191-1/+1
|\ | | | | | | camera-SnapdragonCamera.lnx.3.0
| * Fix issue of that session isn't createdjinwu2019-02-191-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 changes Ibbd8ccef,I0452fb96 into camera-SnapdragonCamera.lnx.3.0Linux Build Service Account2019-02-191-6/+14
|\ \ | | | | | | | | | | | | | | | * changes: fix Macro Auto Focus mode is not working fix force close when change color effect during HFR recording
| * | fix Macro Auto Focus mode is not workingzhuw2019-02-191-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
| * | fix force close when change color effect during HFR recordingzhuw2019-02-191-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.3.0Linux Build Service Account2019-02-191-18/+30
|\ \
| * | SnapdraongCamera:Fix HEIF longshotjunjiez2019-02-191-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 "SnapdragonCamera: Enable ShutterButton when HDR receive image" into ↵Linux Build Service Account2019-02-191-0/+14
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | SnapdragonCamera: Enable ShutterButton when HDR receive imagexianming wang2019-02-191-0/+14
| |/ | | | | | | | | | | | | Enable ShutterButton when HDR is ON and receive the image. CRs-Fixed: 2378839 Change-Id: I950d3d5d96d2972a5be446596220dcb9ddd4fbd7
* | Merge "fix stop failed issue when repeating start/stop recording" into ↵Linux Build Service Account2019-02-191-6/+7
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | fix stop failed issue when repeating start/stop recordingzhuw2019-02-191-6/+7
| |/ | | | | | | | | | | | | don't call mediarecorder.stop before start Change-Id: Idfbeaceb0147254bcf6fd93a1ef8da2370ed769f CRs-Fixed:2373849
* / SnapdraongCamera:Fix HAL-ZSL flashjunjiez2019-02-191-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
* Merge "SnapdragonCamera: Set NOISE_REDUCTION_MODE_FAST when disable MFNR" ↵Linux Build Service Account2019-02-191-1/+1
|\ | | | | | | into camera-SnapdragonCamera.lnx.3.0
| * SnapdragonCamera: Set NOISE_REDUCTION_MODE_FAST when disable MFNRxianming wang2019-02-181-1/+1
| | | | | | | | | | | | | | Set NOISE_REDUCTION_MODE_FAST when disable MFNR. CRs-Fixed: 2369613 Change-Id: I79abd5c8fe3454f49bd0d0b7b06c76c306e89be4
* | SnapdragonCamera: Add abortCaptures for flushxianming wang2019-02-181-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
* | Merge "SnapdraongCamera:Fix IllegalStateException" into ↵Abhijit Trivedi2018-12-191-3/+7
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdraongCamera:Fix IllegalStateExceptionjunjiez2018-12-141-3/+7
| |/ | | | | | | | | | | | | | | Catch the IllegalStateException when release mediaRecorder to avoid FC Change-Id: I2d2bab99f4ad91c54770633b03d206be4d34fd4d CRs-Fixed: 2355038
* | Merge "SnapdragonCamera: ShowUIafterRecording run in UI thread" into ↵Linux Build Service Account2018-12-191-17/+15
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: ShowUIafterRecording run in UI threadxianming wang2018-12-141-17/+15
| |/ | | | | | | | | | | | | ShowUIafterRecording run in UI thread. CRs-Fixed: 2363850 Change-Id: Ia424ab30878c873a49556fa0fd21394ec21663a5
* | Merge "SnapdraongCamera:Disable HEIF in HFR/HSR" into ↵Linux Build Service Account2018-12-191-7/+0
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdraongCamera:Disable HEIF in HFR/HSRjunjiez2018-12-141-7/+0
| |/ | | | | | | | | | | | | | | Due to camera hal doesn't support capture in HFR/HSR, remove heif output in HFR120/HSR120. Change-Id: I79e05aef9a16c2e1ba2a6ec953e785331b373976 CRs-Fixed: 2363769
* | Merge "SnapdraongCamera:Update HEIF thumbnail" into ↵Linux Build Service Account2018-12-191-2/+0
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdraongCamera:Update HEIF thumbnailjunjiez2018-12-141-2/+0
| |/ | | | | | | | | | | | | | | | | Update thumbnail from heic file, when it's taking HEIF image and ensure the orientation is correct. Change-Id: If84c274810100964e6b6b1c3fae05366802afa1f CRs-Fixed: 2355251
* | Merge "SnapdragonCamera: Fix NP when mPreviewCaptureResult is NULL" into ↵Linux Build Service Account2018-12-191-2/+2
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Fix NP when mPreviewCaptureResult is NULLxianming wang2018-12-141-2/+2
| |/ | | | | | | | | | | | | Fix NP when mPreviewCaptureResult is NULL in first enter camera. CRs-Fixed: 2355055 Change-Id: Ie1246189127affb883098e7d26054ae7109f406e
* / SnapdraongCamera:Fix IllegalArgumentExceptionjunjiez2018-12-141-1/+1
|/ | | | | | | | Catch IllegalArgumentException when trigger auto focus but some output is not valid to avoid FC Change-Id: I02bfb00c5ccb151fa8964677d14eb342eb9e50ff CRs-Fixed: 2360580