summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "fix FD is disabled during video snaphot" into ↵Simmi Pateriya2018-12-121-0/+1
|\ | | | | | | camera-SnapdragonCamera.lnx.2.0
| * fix FD is disabled during video snaphotzhuw2018-12-051-0/+1
| | | | | | | | | | | | | | apply FD settings in video snapshot Change-Id: I0768c51ecd984173f5f33762199d9d21ffb62c8f CRs-Fixed:2362009
* | Merge "fix unknow camera id error when getcamerainfo in APP" into ↵Linux Build Service Account2018-12-121-1/+2
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | fix unknow camera id error when getcamerainfo in APPzhuw2018-12-051-1/+2
| |/ | | | | | | | | | | | | use camera2 API instead of camera1 API Change-Id: Ie1d6311b8e8ee3c76cbb322c8809690fdf80dd79 CRs-Fixed:2356334
* | Merge "Fix capture liveshot exception" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2018-12-121-2/+5
|\ \
| * | Fix capture liveshot exceptionjinwu2018-12-071-2/+5
| |/ | | | | | | | | | | Catch IllegalStateException when capturing liveshot. Change-Id: I6156da3764e45dddfab259a897f3545a858cd3f6
* | Merge "Requirement from EIS team" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2018-12-121-3/+8
|\ \
| * | Requirement from EIS teamzhuw2018-12-051-3/+8
| |/ | | | | | | | | | | | | | | don't set endofstream when pause by default add switcher for setting vendor tags when pasue CRs-Fixed:2353032 Change-Id: I7da748cff85584d65818834180a5f9a843c1009d
* | Merge "SnapdraongCamera:Fix HEIF Capture" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2018-12-121-21/+13
|\ \
| * | SnapdraongCamera:Fix HEIF Capturejunjiez2018-12-051-21/+13
| |/ | | | | | | | | | | | | | | | | Create session with SessionConfiguration when HEIF is enabled to avoid conflict with FS feature. Change-Id: Ia6eaf36ad4768217e8ccde4c4075deccb90038df CRs-Fixed: 2362158
* | Merge "catch Time out waiting for surface exception" into ↵Linux Build Service Account2018-12-121-1/+6
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | catch Time out waiting for surface exceptionzhuw2018-12-051-1/+6
| |/ | | | | | | | | | | | | catch exception and print log Change-Id: Idc5c72bd1ae2f83e7bb6a365c5b146506d2be3e2 CRs-Fixed:2354024
* / fix no EIS effect on video snapshotzhuw2018-12-051-0/+2
|/ | | | | | | apply video Stabilization in video snapshot request Change-Id: Id79baa91a216fe940c56f0047f7cc14d90939fc6 CRs-Fixed:2360094
* Merge "fix ROI flicker twice when open camera" into ↵Linux Build Service Account2018-12-051-1/+0
|\ | | | | | | camera-SnapdragonCamera.lnx.2.0
| * fix ROI flicker twice when open camerazhuw2018-11-141-1/+0
| | | | | | | | | | | | | | remove updateFocusStateChange in onCaptureProgressed Change-Id: Ic1cedbd902e2d5b073dd2fba72f8c1db944841ee CRs-Fixed:2346492
* | Merge "Remove set preview size equal to video size when HFR" into ↵Linux Build Service Account2018-12-051-5/+1
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | Remove set preview size equal to video size when HFRjinwu2018-11-221-5/+1
| |/ | | | | | | Change-Id: Ie2383e8baf5fdf496c4f23c4bee69026823b77b4
* | Merge "add start and stop recording time in log" into ↵Linux Build Service Account2018-12-051-3/+8
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | add start and stop recording time in logzhuw2018-12-031-3/+8
| | | | | | | | | | | | | | | | | | | | | add log to print start and stop recording time CRs-Fixed:2355177 Change-Id: I8349fe2d1fd3aad68d07ce4a8fbd4c609ec42879
* | | Merge "SnapdragonCamera: Fix video fps is 60, preview fps is 30." into ↵Linux Build Service Account2018-12-051-11/+7
|\ \ \ | |/ / |/| | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Fix video fps is 60, preview fps is 30.xianming wang2018-11-281-11/+7
| |/ | | | | | | | | | | | | Fix video fps is 60, preview fps is 30. CRs-Fixed: 2357348 Change-Id: I2c5ba41a9b0a6d719e3a70a3f52cc92559c76e4a
* | Merge "SnapdraongCamera:Exif location info" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2018-11-301-1/+1
|\ \
| * | SnapdraongCamera:Exif location infojunjiez2018-11-151-1/+1
| |/ | | | | | | | | | | | | | | | | Add location information to the exifinterface of the postprocessed and ZSL images. Change-Id: I367e428d6b09900d4a69e05b205c7b397a60c6a8 CRs-Fixed: 2332325
* | Merge "Upate liveshot size" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2018-11-301-9/+32
|\ \
| * | Upate liveshot sizejinwu2018-11-221-9/+32
| |/ | | | | | | | | | | | | | | | | 1.Should support 30fps 2.Should match aspect ratio of Video size 3.If 4k recording or HFR/HSR, set liveshot size to be same as video size. Change-Id: If5b89519f55a7a8a4e92c4062d0bddd4bf4e2935
* | Merge "SnapdragonCamera: Use HAL-ZSL to capture in ACTION_IMAGE_CAPTURE" ↵Linux Build Service Account2018-11-301-4/+13
|\ \ | | | | | | | | | into camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Use HAL-ZSL to capture in ACTION_IMAGE_CAPTURExianming wang2018-11-141-4/+13
| |/ | | | | | | | | | | | | Use HAL-ZSL to capture in ACTION_IMAGE_CAPTURE. CRs-Fixed: 2344684 Change-Id: I9ebd36130e87bf97ff559295c7a75ae61973e587
* | Merge "SnapdragonCamera: Add AE_PRECAPTURE_TRIGGER_CANCEL in touch focus" ↵Linux Build Service Account2018-11-301-14/+52
|\ \ | | | | | | | | | into camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Add AE_PRECAPTURE_TRIGGER_CANCEL in touch focusxianming wang2018-11-221-14/+52
| |/ | | | | | | | | | | | | | | | | | | 1. Touch preflash usecase. 2. If Touch Preflash is completed, send AE_PRECAPTRURE_TRIGGER_CANCEL for only 1 frame, app only call once. 3. Reset the AE_PRECAPTURE_TRIGGER_IDLE after Step 2. CRs-Fixed: 2338725 Change-Id: Ia890b4f05fcabbfc71be180b306146f2a806e9b8
* | Merge "SnapdraongCamera:Fix CalledFromWrongThreadException" into ↵Linux Build Service Account2018-11-301-3/+8
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdraongCamera:Fix CalledFromWrongThreadExceptionjunjiez2018-11-131-3/+8
| |/ | | | | | | | | | | | | | | | | Make UI related methods run on the main thread in CameraCaptureSession.StateCallback to avoid CalledFromWrongThreadException Change-Id: Iabce187f790fd2006ddb5c4e77ef5e047be6b815 CRs-Fixed: 2311900
* | Merge "SnapdraongCamera:Fix invalid ImageReader" into ↵Linux Build Service Account2018-11-301-2/+5
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdraongCamera:Fix invalid ImageReaderjunjiez2018-11-141-2/+5
| |/ | | | | | | | | | | | | | | | | make sure the needed ImageReaders are valid in captureStillPicture to avoid NP Change-Id: I28525ae5951c548fc06800bb62a3030dccc76b48 CRs-Fixed: 2344071
* | Merge "SnapdragonCamera: Completed the function of FS" into ↵Linux Build Service Account2018-11-301-6/+76
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Completed the function of FSxianming wang2018-11-141-6/+76
| |/ | | | | | | | | | | | | Completed the function of FS for special sensor mode. CRs-Fixed: 2334834 Change-Id: Ia32111be5e1fd14bdb31407a43ad8eb3b97f5415
* | Merge "SnapdraongCamera:Fix longshot count" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2018-11-301-1/+6
|\ \
| * | SnapdraongCamera:Fix longshot countjunjiez2018-11-151-1/+6
| |/ | | | | | | | | | | | | | | | | close redundant image when longshot is not active and the timestamp of the image is later then the last capture. Change-Id: I90987c8abaec2d41c2c9bd26d7ab579ed8790fce CRs-Fixed: 2335369
* | Merge "Fix UI unnormal after snapshot failed." into ↵Linux Build Service Account2018-11-301-3/+3
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | Fix UI unnormal after snapshot failed.jinwu2018-11-141-3/+3
| |/ | | | | | | Change-Id: I7dddb3233e87e4a03cdbdc7391dbbcaa2adbb283
* / SnapdragonCamera: Add vendorTag noiseReduction for HDRxianming wang2018-11-141-3/+27
|/ | | | | | | | | Add vendorTag custom_noise_reduction for HDR Scene. Disable ZSL when enable HDR, capture button should enable until image received. CRs-Fixed: 2348911 Change-Id: I88c21c682d04636e903b07804634add60a3ba1f6
* Merge "Fix FC of longshot > 64" into camera-SnapdragonCamera.lnx.2.0Linux Build Service Account2018-11-131-1/+1
|\
| * Fix FC of longshot > 64jinwu2018-11-081-1/+1
| | | | | | | | Change-Id: I58f1f125616556cdef37d940cb652ec8dc144e90
* | Merge "SnapdragonCamera: Fix no sound at 2s in "Countdown timer"" into ↵Linux Build Service Account2018-11-131-0/+10
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Fix no sound at 2s in "Countdown timer"xianming wang2018-11-071-0/+10
| |/ | | | | | | | | | | | | | | Move the SoundPool.load method more ahead play method for load the sound completed so that the sound can play. CRs-Fixed: 2338189 Change-Id: If4282aea8c081c54f40e1d8a5e091f412c7e3e53
* | Merge "SnapdragonCamera: Add customNoiseReduction vendorTag" into ↵Linux Build Service Account2018-11-131-2/+12
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Add customNoiseReduction vendorTagxianming wang2018-11-071-2/+12
| |/ | | | | | | | | | | | | Add CustomNoiseReduction vendorTag for MNNR to 3rd apk. CRs-Fixed: Change-Id: I130cf057af8e41f9be58d259784ade9d8dbdaa1f
* | Merge "SnapdragonCamera: Restrict the fps to 15fps" into ↵Jin Wu2018-11-121-0/+1
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Restrict the fps to 15fpsxianming wang2018-11-021-0/+1
| | | | | | | | | | | | | | | | | | | | | Fix captureBurstShot restrict preview frame fps to 15. CRs-Fixed: 2334906 Change-Id: I4196d3550c0929bc64a825d8742bd2c365a10de6
* | | Merge "SnapdragonCamera: Add 30fps for video pause preview in normal" into ↵Jin Wu2018-11-121-0/+4
|\ \ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | | SnapdragonCamera: Add 30fps for video pause preview in normalxianming wang2018-10-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 30fps for video pause preview in normal. CRs-Fixed: 2310165 Change-Id: Ic0414d64ed50bb9fd27a028a477b3eee84ab7e06