summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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: Fix mSoundPool is NULL and load resource slowly" ↵Linux Build Service Account2018-12-192-16/+12
|\ \ | | | | | | | | | into camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Fix mSoundPool is NULL and load resource slowlyxianming wang2018-12-142-16/+12
| |/ | | | | | | | | | | | | | | Init the SouldPool when the mCountDownView is not NULL and the SoundPool is NULL. CRs-Fixed: 2360653 Change-Id: I913bbd0c8b190a2a73d0d0123ffa8753d4ec9f91
* | 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 unsupported size" into ↵Linux Build Service Account2018-12-192-1/+6
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdraongCamera:Disable HEIF unsupported sizejunjiez2018-12-142-1/+6
| |/ | | | | | | | | | | | | | | Remove the unsupported size from picture size option when enable HEIF. Change-Id: Ibf4a5dce948829d86a4fbda46c5f763880bc26f8 CRs-Fixed: 2364561
* | 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 "SnapdragonCamera: Fix NP when mCharacteristics size is 0" into ↵Linux Build Service Account2018-12-191-2/+4
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Fix NP when mCharacteristics size is 0xianming wang2018-12-141-2/+4
| |/ | | | | | | | | | | | | Fix NP when mCharacteristics size is 0. CRs-Fixed: 2356345 Change-Id: I9e77dfa035defc49ea6a29103e92983949377eaf
* | Merge "SnapdraongCamera:Update HEIF thumbnail" into ↵Linux Build Service Account2018-12-194-14/+36
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdraongCamera:Update HEIF thumbnailjunjiez2018-12-144-14/+36
| |/ | | | | | | | | | | | | | | | | 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
* 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-122-1/+15
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | fix unknow camera id error when getcamerainfo in APPzhuw2018-12-052-1/+15
| |/ | | | | | | | | | | | | 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 "fix monkey error in updateStorageHint" into ↵Linux Build Service Account2018-12-121-0/+3
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | fix monkey error in updateStorageHintzhuw2018-12-051-0/+3
| |/ | | | | | | | | | | | | | | When the activity is about to be stopped don't show hint to avoid window manager error Change-Id: Iff6696a0a695d1e08ec084956ee76e91e0432f6b CRs-Fixed:2358109
* | 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 "SnapdraongCamera:Fix CountDown sound" into ↵Linux Build Service Account2018-12-051-1/+12
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdraongCamera:Fix CountDown soundjunjiez2018-11-271-1/+12
| |/ | | | | | | | | | | | | | | Recreate the sound pool when it's null to avoid error. Change-Id: Iefb89c7fe910bdf0fbaa44317c17a74b88350d75 CRs-Fixed: 2356413
* | 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-052-14/+14
|\ \ \ | |/ / |/| | | | | camera-SnapdragonCamera.lnx.2.0
| * | SnapdragonCamera: Fix video fps is 60, preview fps is 30.xianming wang2018-11-282-14/+14
| |/ | | | | | | | | | | | | 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-302-3/+8
|\ \
| * | SnapdraongCamera:Exif location infojunjiez2018-11-152-3/+8
| |/ | | | | | | | | | | | | | | | | Add location information to the exifinterface of the postprocessed and ZSL images. Change-Id: I367e428d6b09900d4a69e05b205c7b397a60c6a8 CRs-Fixed: 2332325