summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "SnapdragonCamera: Fix selfie mirror is not work in 3rd app" into ↵Linux Build Service Account2019-06-121-8/+3
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | SnapdragonCamera: Fix selfie mirror is not work in 3rd appxianming wang2019-06-041-8/+3
| |/ | | | | | | | | | | | | | | (1) App should use YUV_420_888 when enable selfie mirror. (2) App didn`t use HAL_ZSL when flash is ON. CRs-Fixed: 2457539 Change-Id: Idf87eebe3446b83550fae6856b5168be78757428
* | Merge "Dismiss Mute icon during HFR/SSM recording" into ↵Linux Build Service Account2019-06-121-0/+4
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | Dismiss Mute icon during HFR/SSM recordingzhuw2019-06-041-0/+4
| |/ | | | | | | | | | | | | dismiss mute icon during HFR/SSM recording as these 2 mode don't support audio recording Change-Id: I5bf98ed3b18262064291ffce4b720987e79b96ae
* | Merge "Fix snapshot failed from fixed focus sensor." into ↵Linux Build Service Account2019-06-121-1/+8
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | Fix snapshot failed from fixed focus sensor.jinwu2019-06-041-1/+8
| |/ | | | | | | Change-Id: I0ecb9d82169320068e5fd6ad5a758664beb23890
* | Merge "fix force close when TAF in HFR preview" into ↵Linux Build Service Account2019-06-121-7/+23
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | fix force close when TAF in HFR previewzhuw2019-06-051-7/+23
| |/ | | | | | | | | | | use captureBurst instead of capture in HFR TAF case Change-Id: Ie351c418fbcc4af75b9c9b5a990829d54ecdba39
* | Merge "fix flash is fired in wrong condition" into ↵Linux Build Service Account2019-06-121-6/+9
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | fix flash is fired in wrong conditionzhuw2019-06-041-6/+9
| |/ | | | | | | | | | | | | | | | | flash is fired when snapshot under bright condition if red eye reduction is ON. There is no need to send CONTROL_AE_PRECAPTURE_TRIGGER_START if red eye reduction is ON Change-Id: I1e49b924e2c4d904acecd4cca4c8533154f30f08
* | Merge "SnapdragonCamera: Add T2T function in Video/HFR/ RTB/SAT mode" into ↵Linux Build Service Account2019-06-121-7/+30
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | SnapdragonCamera: Add T2T function in Video/HFR/ RTB/SAT modexianming wang2019-06-051-7/+30
| |/ | | | | | | | | | | Add T2T function in Video/HFR/ RTB/SAT mode. Change-Id: Ib4475c24550a81590574c9c7ec44de49b5955af5
* / SnapdragonCamera: Add Zoom SeekBar functionxianming wang2019-06-121-0/+16
|/ | | | | | Add zoom ZeekBar function. Change-Id: I2f1d0eccc6bf8f11bc87a4572a88107b2c36ea0d
* Merge "add switch camera by id to video mode" into ↵Linux Build Service Account2019-06-041-1/+2
|\ | | | | | | camera-SnapdragonCamera.lnx.3.0
| * add switch camera by id to video modezhuw2019-05-221-1/+2
| | | | | | | | | | | | | | | | 1. add switch camera by id to video mode 2. add prop persist.sys.camera.devoption.debug 3. use this prop to control if APP shows some options Change-Id: I8fc3b5c9def7f0a44e46b25a0225222b768d1a66
* | Merge "SnapdraongCamera:HEIF on Android Q" into camera-SnapdragonCamera.lnx.3.0Linux Build Service Account2019-06-041-24/+30
|\ \
| * | SnapdraongCamera:HEIF on Android Qjunjiez2019-05-231-24/+30
| | | | | | | | | | | | | | | | | | | | | | | | Request HEIC stream from HAL directly instead of encoding with HeifWriter in app on Android Q Change-Id: I6aa794b190571960e76d063fd638f78d49da00d3
* | | Merge "Use SAT in video mode if available" into camera-SnapdragonCamera.lnx.3.0Linux Build Service Account2019-06-041-0/+2
|\ \ \
| * | | Use SAT in video mode if availablezhuw2019-05-201-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | when multi camera is enabled, then video mode will use SAT camera id for rear camera. If multi camera is disabled, then video mode will use camera id 0(main default camera) Change-Id: I499680b8a0d81ea625ca88a7a969b2a0a21d3e53
* | | Merge "finish more details of SSM" into camera-SnapdragonCamera.lnx.3.0Linux Build Service Account2019-06-041-11/+25
|\ \ \
| * | | finish more details of SSMzhuw2019-05-221-11/+25
| | |/ | |/| | | | | | | | | | | | | | | | | | | 1. disable pause icon as not supported 2. User can stop recording manually but will toast 3. start recording with TAG 1 then repeating with TAG 0 Change-Id: I77f84481a2cb466bf3f53e3686d8374e125c2f60
* | | Merge "fix force closed when attach video in msm" into ↵Linux Build Service Account2019-06-041-8/+11
|\ \ \ | | | | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | | fix force closed when attach video in msmzhuw2019-05-131-8/+11
| | |/ | |/| | | | | | | | | | | | | no need abortCapture in this case Change-Id: Id2b214b45d43307342405271c4979d202fa816a4
* | | Merge changes I0d2658c9,Ie7865824,I4d9e438e into camera-SnapdragonCamera.lnx.3.0Linux Build Service Account2019-06-041-24/+77
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: add prop to set HFR rate Use prop to control visibility of SSM Support SSM in HFR mode
| * | | add prop to set HFR ratezhuw2019-05-271-0/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | use prop "persist.sys.camera.hfr.rate" to set rate in HFR mode. use string like hfr120 or hsr120 or off to set values option will be hard selected to that value Change-Id: I0d2658c95c5ccf596fafcd0569216c33bf8ec4eb
| * | Use prop to control visibility of SSMzhuw2019-05-231-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | change OFF entry to 30FPS change method of selecting max rate use prop to control visibility of SSM option Change-Id: Ie7865824861987646943d4902fda6e9cf4865201
| * | Support SSM in HFR modezhuw2019-05-221-17/+74
| |/ | | | | | | | | | | add 2x 4x options for rate 120, 240, 480 Change-Id: I4d9e438e30f4cf509c4c0670842bbc9a113c4b45
* | Merge "enable front/back switch icon in RTB/SAT" into ↵Linux Build Service Account2019-06-041-3/+7
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | enable front/back switch icon in RTB/SATzhuw2019-05-231-3/+7
| |/ | | | | | | | | | | | | | | when switch to front camera in RTB/SAT APP will change mode to Photo as we don't have RTB-front and SAT-Front camera now Change-Id: Iff676797a3733ca1d7daa459359cc1cf2bf74bb5
* | Merge "SnapdragonCamera: Add shutter animation for APP-ZSL mode" into ↵Linux Build Service Account2019-06-041-0/+7
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | SnapdragonCamera: Add shutter animation for APP-ZSL modexianming wang2019-05-151-0/+7
| |/ | | | | | | | | | | | | Add shutter animation for APP-ZSL mode. CRs-Fixed: 2444503 Change-Id: Iecd833877831e9146007690d3d4866b3c538c722
* / Enable color effect in Video and HFR modezhuw2019-05-231-2/+10
|/ | | | | | | | | 1. show color effect icon in Video/HFR mode 2. hide color effect panel after recording 3. use high speed capture session and method setRepeatingBurst in HFR mode when select color Change-Id: I059be0dc964191338c7bec0e795522807072c3a9
* add and remove some logszhuw2019-05-121-3/+1
| | | | | | some logs are print too much times Change-Id: Icd604289eba8d11f10636a8261cc48f6b1a4fa37
* Merge "Don't close session after abortCaptures" into ↵Linux Build Service Account2019-05-101-1/+1
|\ | | | | | | camera-SnapdragonCamera.lnx.3.0
| * Don't close session after abortCapturesjinwu2019-05-071-1/+1
| | | | | | | | Change-Id: Iac4181dbda903bb4f0b15a30693ff9a672f75482
* | Merge "remove logs" into camera-SnapdragonCamera.lnx.3.0Linux Build Service Account2019-05-101-2/+0
|\ \
| * | remove logszhuw2019-04-301-2/+0
| |/ | | | | | | | | | | remove logs Change-Id: I4bbd4241deaafc1b91adfee715d9470428739d1b
* | Merge "Fix flash doesn't work in HFR mode" into camera-SnapdragonCamera.lnx.3.0Linux Build Service Account2019-05-101-0/+1
|\ \
| * | Fix flash doesn't work in HFR modezhuw2019-05-091-0/+1
| |/ | | | | | | | | | | apply video flash setting in HFR mode Change-Id: Ie99da2506d561aecf6bd8956cf67327109299090
* / SnapdragonCamera: Fix AE state is NULL in some scenariosxianming wang2019-05-061-1/+5
|/ | | | | | | Fix AE state is NULL in some scenarios. CRs-Fixed: 2441519 Change-Id: Iab8651a57d0108ed4c12e0fb2caa5d94902cebdb
* Merge "SnapdragonCamera: Touch track focus function of complete" into ↵Linux Build Service Account2019-04-251-3/+203
|\ | | | | | | camera-SnapdragonCamera.lnx.3.0
| * SnapdragonCamera: Touch track focus function of completexianming wang2019-04-241-3/+203
| | | | | | | | | | | | Touch track function of complete. Change-Id: I0c4fc9a9a973bcf947251e17776aa7bad5ea7895
* | Merge "fix flash on doesn't work in ProMode" into ↵Linux Build Service Account2019-04-251-53/+36
|\ \ | | | | | | | | | camera-SnapdragonCamera.lnx.3.0
| * | fix flash on doesn't work in ProModezhuw2019-04-231-53/+36
| |/ | | | | | | | | | | apply related settings when snapshot Change-Id: I652b871a2237aae31b5061363bf3c77a2175c73c
* / Checking session is not null before call abortCapturejinwu2019-04-231-1/+1
|/ | | | Change-Id: I54132e4d5da6d875874aa350fd84b89010dbeb88
* SnapdraongCamera:Fix longshot count in nZSLjunjiez2019-04-161-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: 2436119
* SnapdragonCamera: Add array length judgment avoid hal errorxianming wang2019-04-091-3/+5
| | | | | | Add array length judgment avoid hal error. Change-Id: I521475b70cba03595a0e0542cfa49af5948b5c61
* Merge "SnapdragonCamera: AEC warm start function completed" into ↵Linux Build Service Account2019-04-081-8/+38
|\ | | | | | | camera-SnapdragonCamera.lnx.3.0
| * SnapdragonCamera: AEC warm start function completedxianming wang2019-04-041-8/+38
| | | | | | | | | | | | | | Complete the function AEC warm start. CRs-Fixed: Change-Id: Ic96f617a1cf70bce621ec8dc263ec74579dff245
* | add HFR optionzhuw2019-04-081-7/+31
|/ | | | | | add HFR option Change-Id: Ia9daae1ea2ae3e25b113b4f8aa5541c05e7b3e9c