summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera:reduce memory cost" into camera.lnx.3.1Camera Software Integration2018-09-211-23/+106
|\
| * SnapdragonCamera:reduce memory costjunjiez2018-09-111-23/+106
| | | | | | | | | | | | | | | | | | | | | | | | 1.limit max preview size to 1080p 2.set max image count of ImageReader to 3. 3.Clear ZSL Queue when start recording. 4.use repeatingBurst instead of repeatingRequest. 5.set ZSL queue size to 3. 6.set ZSL snapshot to 15fps. 7.remove ZslFalloff queue. Change-Id: I87ebec71d5b85b3e5f12a61c5898e43e6e184d61
* | SnapdragonCamera:Fix manual focusjunjiez2018-08-291-7/+18
|/ | | | | | | | | set the AF mode when turn on and turn off manual focus, don't unlock focus when capture in manual focus mode. Change-Id: I007c9235c67248ba6850e95bc3ab267703a70f06 CRs-Fixed: 2208004
* Merge "SnapdragonCamera: Remove HAL-ZSL in non Camx" into camera.lnx.3.1Camera Software Integration2018-08-201-3/+95
|\
| * SnapdragonCamera: Remove HAL-ZSL in non Camxxianming wang2018-08-161-3/+95
| | | | | | | | | | | | | | | | (1) Remove HAL-ZSL in non camx. (2) Paralle lock AF and preCapture on one request. CRs-Fixed: 2297745 Change-Id: I0a8c87805f709761bcd3ae0fba4a747090cd1454
* | SnapdragonCamera: Fix NP in the onConfigured methodxianming wang2018-08-141-4/+8
|/ | | | | | | | Fix NP in the onConfigured method, onConfigured method is asynchronous method. CRs-Fixed: 2293690 Change-Id: I1c023aed3a34cf7d04ab60dbe1e848dbd5816dde
* SnapdragonCamera:Fix thumbnail updatejunjiez2018-07-271-13/+16
| | | | | | | Upate the thumbnail in continuous shot. Change-Id: I5e49f7f1c3b46a906fdef9bed43f85d905520dd5 CRs-Fixed: 2281482
* Merge "SnapdragonCamera:Fix NP in create session" into camera.lnx.3.1Camera Software Integration2018-07-091-0/+2
|\
| * SnapdragonCamera:Fix NP in create sessionjunjiez2018-07-041-0/+2
| | | | | | | | | | | | | | | | Catch NP when imageReader of postprocessor is null to avoid FC. Change-Id: If6628b48806a7adbe88818cc2adbfdfadaba046f CRs-Fixed: 2253506
* | Merge "SnapdragonGallery:Fix IllegalStateException" into camera.lnx.3.1Camera Software Integration2018-07-091-0/+2
|\ \
| * | SnapdragonGallery:Fix IllegalStateExceptionjunjiez2018-07-041-0/+2
| |/ | | | | | | | | | | | | | | | | Catch IllegalStateException to avoid FC when can't get a valid surface from mediaRecorder in recording. Change-Id: Idee2a99b6e83e864a005623c195d686bfa7771b3 CRs-Fixed: 2265015
* | Merge "SnapdragonCamera:Fix IllegalStateException" into camera.lnx.3.1Camera Software Integration2018-07-091-6/+16
|\ \
| * | SnapdragonCamera:Fix IllegalStateExceptionjunjiez2018-07-041-6/+16
| |/ | | | | | | | | | | | | | | | | Catch IllegalStateException in ImageAvailableListener to avoid read image when it's closed by system. CRs-Fixed: 2270267 Change-Id: I6e3bf5ee97c01fe62154211d4e961f5d57f999ff
* | SnapdragonCamera:Fix IllegalStateException in mokey testzhuw2018-07-061-0/+18
| | | | | | | | | | | | | | Don't take picture if camera app exist. Change-Id: I1f60b1c8a4f6b1a274955a0af09214dae132e205 CRs-Fixed: 2156458
* | Change CDS mode value to 0zhuw2018-07-021-2/+2
|/ | | | | | set CDS mode to 0(OFF) from APP side Change-Id: Ie9b1ab17376db6385e0c868c5bd4a704348f4509
* Merge "SnapdragonCamera:Fix CTS issue" into camera.lnx.3.1Camera Software Integration2018-06-281-0/+10
|\
| * SnapdragonCamera:Fix CTS issuejunjiez2018-06-251-0/+10
| | | | | | | | | | | | | | | | | | | | When DPAD_CENTER is pressed, capture a image to pass CTS test and set the default focused view to avoid DPAD_CENTER key event lost. Change-Id: I75601cf0576251492140e8da30eac0b3d149b5c8 CRs-Fixed: 2226102
* | SnapdragonCamera: Add videoEncoder filter fpsxianming wang2018-06-261-7/+48
| | | | | | | | | | | | | | | | Add VideoEncoder filter fps, if fps does not support, show tips to the user. CRs-Fixed: 2265791 Change-Id: I78786d85fffb4ce60e978b3f4aada20bd067b91d
* | SnapdragonCamera: Fix NullPointerException in Monkey testxianming wang2018-06-211-1/+4
|/ | | | | | Fix NullPointerException in the Customer Monkey test. Change-Id: I524a27c3c538bf21d39780812f93d3c300427f9a
* SnapdragonCamera: Fix NullPointerException in monkey testxianming wang2018-06-201-0/+1
| | | | | | | Fix NullPointerException in the monkey test. CRs-Fixed: 2264071 Change-Id: I80bb2fc3b983c9c91820937e728037b8e1e124d7
* Merge "Fix force close when init camera info on P" into camera.lnx.3.1Camera Software Integration2018-06-161-1/+0
|\
| * Fix force close when init camera info on Pzhuw2018-06-151-1/+0
| | | | | | | | | | | | | | Use camera service instead of hardware.camera to get camera info Change-Id: I2eb7c8c68885d614322ca40b0661b796620200dc
* | SnapdragonCamera: Fix live shot fps issue on Napalixianming wang2018-06-121-0/+11
|/ | | | | | | | | Send Snapshot stream together with preview and video stream for Snapshot request, it looks need app sends shutter notify for every request. Stream is the surface for the app. CRs-Fixed: 2169009 Change-Id: I8a7e87b2ee25bbb1ed1dd9427d4de2fbcc122795
* SnapdragonCamera:Fix NP in touch focusjunjiez2018-05-301-0/+4
| | | | | | | | Avoid CropRegion to be null when caculate afaeRectangle Change-Id: I112ca01225ffe542b6f33e68c9aed687aba1c8f6 CRs-Fixed: 2237113
* SDCamera: Fix thumbnail is black when filter enabledzhuw2018-05-231-25/+51
| | | | | | start mediaRecorder after progressing image is available Change-Id: Icb2b07a367f2f35e2d7d902d98919735736932bc
* SnapdragonCamera: Reset audioMute when mute in the recordingxianming wang2018-05-161-0/+7
| | | | | | | | When mute in the recording, and exit camera, reset the unmute value, so that does not affect the sound recorder. CRs-Fixed: 2153745 Change-Id: I3d8413dce714d3bc09f219ac4d10f605f5481f0d
* Fix focus close when close Camera during RTB processingzhuw2018-05-101-1/+6
| | | | | | if Image is closed, don't need to save RTB image. Change-Id: I6c3706216aa389a119eef7f90ba3aec303c28625
* Merge "Play sound when start/stop recording" into camera.lnx.3.1Camera Software Integration2018-05-081-0/+12
|\
| * Play sound when start/stop recordingjinwu2018-05-021-0/+12
| | | | | | | | | | | | Add an action of playing sound when start or stop recording. Change-Id: I5351d347beea26cddef7c87e8a2b37a1f2f421c2
* | SnapdragonCamera: Fix FC keep open and close the cameraxianming wang2018-05-031-2/+9
|/ | | | | | | | When Camera is closed, surface wait time out and throw IllegalState Exception, app will catch the exception and avoid force close. CRs-Fixed: 2187990 Change-Id: I3540912a7891a57ab3127b8f500e77947280bcba
* SnapdragonCamera:Disable video in longshotjunjiez2018-04-101-0/+3
| | | | | | | | | When it's in longshot disable video button to avoid memory issue caused by starting recording when longshot is not completed. Change-Id: I4b77e619e1e48d558eadfd46837ec87ebf397df9 CRs-Fixed: 2210569
* Merge "Fix snapshot failed with logical camera" into camera.lnx.3.1Camera Software Integration2018-03-301-0/+3
|\
| * Fix snapshot failed with logical camerazhuw2018-03-261-0/+3
| | | | | | | | | | | | if ZSl is enabled , use takeZSLpicture and return Change-Id: I501b40218daef5a5f2847426df00ab18743ee63f
* | Read vendor tag to give pure blob request in W+T mode.zhuw2018-03-281-0/+2
| | | | | | | | | | | | don't send inputbuffer when state is true Change-Id: Id38d3e4eec7c7f3652c6664278965af7616fd314
* | Add limite to when to show bokeh modezhuw2018-03-281-0/+2
| | | | | | | | | | | | Read vendor tag to enable/disable dual cam specific options like Bokeh Change-Id: Icfb4b417b3c6adc41c89d0d056dc0dee5cc8d73d
* | Fix FD don't update when change flash status during recordingzhuw2018-03-201-1/+2
|/ | | | | | add callback when update video falsh mode Change-Id: I777d4ed644193d96a53f6ca389cf26e5b6b923f6
* SnapdragonCamera: decode mpo file and generate XMPzhuw2018-03-141-6/+32
| | | | | | | | | add method for decoding MPO file add method for decoding MPO bytes add method for generate XMP adjust shutter icon to enable and disable for bokeh Change-Id: I1b1b63e1d01f0ed34c75a98537b1e28e3f31a161
* Use createHighSpeedRequestList in frameworksjinwu2018-03-061-4/+4
| | | | | | | | Instead of defining createHighSpeedRequestList in app, prefer to use it defined in framework and if framework change this api in upgrade then app need do nothing. Change-Id: I64074301e9201913e8bef12bd894c411596aa6bc
* Add ui toast for bokehzhuw2018-01-091-0/+72
| | | | | | add ui toast change for bokeh Change-Id: I51598fbe80dd979159cbe9aadeaea26169026d4d
* Snapdragon: Add bokeh enable options in devzhuw2018-01-031-1/+55
| | | | | | | | | | add bokeh enable options in dev. value: true->enable false->disable blur->enter int value Change-Id: I4e69a5371b60ce55dee2468634b1e14956811f22 CRs-Fixed: 2164757
* Add SWITCH MODEjinwu2018-01-031-18/+57
| | | | | | | When using switch camers by id in Dev Option,add this mode to avoid conflict camera ids issue. Change-Id: Ib0bef784648c0b76a5cb122eaed9859d724a899f
* SnapdragonCamera:fix multi camera switchjunjiez2018-01-031-17/+32
| | | | | | | | | | 1.fix video size lost in logical camera. 2.fix FC by enable zoom. 3.fix FC by touch focus. 4.When opening camera returns error, then clean up the camera with close(). Change-Id: I50fdb2e04df8fcf7d5a09e248b6dc523afba6125
* SnapdragonCamera:support multi camera switchjunjiez2018-01-031-8/+39
| | | | | | | add a new option in dev options to swtich camera by camera Id. Change-Id: Ieeb6f462024c3b155dc5fb532fd737313b9904de
* Merge "SnapdragonCamera: Support HFR 60 and 90 fps" into camera.lnx.3.0-devCamera Software Integration2017-09-201-1/+3
|\
| * SnapdragonCamera: Support HFR 60 and 90 fpsWeijie Wang2017-09-141-1/+3
| | | | | | | | | | | | Support HFR 60 and 90 fps Change-Id: Ib615196e691782ee6d595d5216f2966cee284a9c
* | SnapdragonCamera: Complete the function of QCFAxianming wang2017-09-071-7/+33
|/ | | | | | | | Add support for quadraCFA in HAL3, and Complete the function of QCFA. CRs-Fixed: 2104228 Change-Id: I5ae17d1af3fc433402d0f183c48baf7488768328
* Merge "Revert "SnapdragonCamera: Fix black screen on preview when switch ↵Camera Software Integration2017-08-031-10/+1
|\ | | | | | | camera"" into camera.lnx.3.0-dev
| * Revert "SnapdragonCamera: Fix black screen on preview when switch camera"Weijie Wang2017-07-261-10/+1
| | | | | | | | | | | | This reverts commit 496cc1548342f86e54fa22590f98a5794cdd71ad Change-Id: I16dd25758305d6f8ed9b4a69b65fa9a74a764c78
* | SnapdragonCamera: Add ZSL in HAL modeWeijie Wang2017-07-251-19/+57
|/ | | | | | Add ZSL in HAL mode Change-Id: Ifa803c970cfc559723e3599821b74cc8584782a2
* SnapdragonCamera: refactor captureStillPictureWeijie Wang2017-07-211-129/+144
| | | | | | Split captureStillPicture into multiple smaller methods Change-Id: I0ebc9625be880539f7c0c1d68350c093616205ad