summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Add dependency for dual camera scene" into ↵Camera Software Integration2016-07-191-2/+3
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add dependency for dual camera sceneJay Wang2016-07-071-2/+3
| | | | | | | | | | | | | | For dual camera scene mode, add dependency to force Flash off. CRs-Fixed: 1037060 Change-Id: I2dbf5a67a751e82d292b8aff4bdc3a2a2b5aa296
* | Merge "SnapdragonCamera: Fix race condition when opening cameras" into ↵Camera Software Integration2016-07-191-27/+35
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix race condition when opening camerasJay Wang2016-07-081-27/+35
| |/ | | | | | | | | | | | | | | Fix race condition between surface ready and camera opened that was causing createSession to be called twice for same device. CRs-Fixed: 1019361 Change-Id: Ieb62b394f1cf83cc83e2b9e290ce6758e2ade377
* | Merge "SnapdragonCamera: Replacing mono surface" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-07-194-61/+118
|\ \
| * | SnapdragonCamera: Replacing mono surfaceJack Yoo2016-07-074-61/+118
| | | | | | | | | | | | | | | | | | | | | Replacing mono surface to allocation dummy surface Change-Id: I8ed7396e6bee7fd34e223f285c0d9693ff04527a CRs-Fixed: 1035245
* | | Merge "SnapdragonCamera: Adding ubifocus post proc filter" into ↵Camera Software Integration2016-07-1913-60/+533
|\| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Adding ubifocus post proc filterJack Yoo2016-07-0713-60/+533
| | | | | | | | | | | | | | | | | | | | | Introducing ubifocus to camera2. Change-Id: I611bea207b9cbbde56a23720b22a5a5e3daa215f CRs-Fixed: 1035245
* | | Merge "SnapdragonCamera: FrameListener and Video frame processor" into ↵Camera Software Integration2016-07-1915-138/+967
|\| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: FrameListener and Video frame processorJack Yoo2016-07-0715-138/+967
| |/ | | | | | | | | | | | | | | Adding FrameListener with TrackingFocus Adding VideoFrameProcessor with beautification Change-Id: Id51a0417af43140ed27ea5859ff939adc2e78c43 CRs-Fixed: 1035245
* | SnapdragonCamera: Fix json markingByunghun Jeon2016-07-131-1/+28
| | | | | | | | | | | | Json marking was not proper. Fix it with proper marking Change-Id: Ic57757f165bd19fc34d33344c6b9b66b891f30a6
* | Merge "SnapdragonCamera: Resolve integer overflow issue" into ↵Camera Software Integration2016-07-111-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Resolve integer overflow issueJay Wang2016-07-051-1/+1
| |/ | | | | | | | | | | | | | | | | The video bit rate calculation can cause integer overflow due to multiplying two huge numbers. To resolve the issue, do the division before the multiplication. Change-Id: I8b077fd68ed3e4f22cc5a2f9cb2a1490d0ed3376 CRs-Fixed: 1030274
* | Merge "SnapdragonCamera: Fix panorama cancel button location" into ↵Linux Build Service Account2016-07-111-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix panorama cancel button locationByunghun Jeon2016-07-061-1/+1
| |/ | | | | | | | | | | | | | | | | Panorama cancel button location is not correct when device is rotated by 180 degrees. Set the proper value to the button when rotated by 180 degrees. Change-Id: I16cb6978f9b612944413fbc400d6aec920599ba7 CRs-Fixed: 1035742
* / SnapdragonCamera: Fix the issue that camera control is removedJay Wang2016-07-061-4/+7
|/ | | | | | | | Fix the issue that camera control menu is removed after HDR icon is clicked from camera control menu. Change-Id: I6e7c1a81fa356d0fa6cb5eb336ef844266a1bbf0 CRs-Fixed: 1038311
* Merge "SnapdragonCamera: Allow take snapshot while recording video" into ↵Camera Software Integration2016-07-046-28/+175
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Allow take snapshot while recording videoByunghun Jeon2016-06-296-28/+175
| | | | | | | | | | | | | | | | Allow take snapshot while recording video by showing shutter button. Directly call capture when shutter button is pressed. Change-Id: Iae4d42d8878ea82b459ec67709b0ad8e340c8226 CRs-Fixed: 1028463
* | Merge "SnapdragonCamera: Fix pause while taking continuous shot" into ↵Camera Software Integration2016-07-041-0/+8
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix pause while taking continuous shotByunghun Jeon2016-06-291-0/+8
| | | | | | | | | | | | | | | | | | When pause/resuming initialize to proper state so that when paused/resumed while taking picture, it would not result in a bad state Change-Id: I597aa96b930cdb855c83d2f433470c23ab9cfa37 CRs-Fixed: 1025804
* | Merge "SnapdragonCamera: Add face detection to camera2" into ↵Camera Software Integration2016-07-048-75/+388
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add face detection to camera2Byunghun Jeon2016-06-298-75/+388
| | | | | | | | | | | | | | | | Add face detection to camera2. Receive face data from camera2 and use faceView UI to draw it Change-Id: Id9c49ab6dd73de316398c57981cc0b9df0400b45 CRs-Fixed: 1025797
* | Merge "SnapdragonCamera: Use json file to read setting dependency" into ↵Camera Software Integration2016-07-042-187/+143
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Use json file to read setting dependencyByunghun Jeon2016-06-292-187/+143
| | | | | | | | | | | | | | Instead of writing the dependency in java, read the dependency from json file Change-Id: I5a46d35b66a289e2a3ee8b72d0059fd9929891f2
* | Merge "SnapdragonCamera: Add video to Camera2 module" into ↵Camera Software Integration2016-07-0412-36/+1287
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add video to Camera2 moduleByunghun Jeon2016-06-2912-36/+1287
| | | | | | | | | | | | Add video to Camera2 module and combine the UI Change-Id: I0bcd86eb6b95fe2180856780ddd794682259e799
* | Merge "SnapdragonCamera: Fix first-time crash and cleanup permissions" into ↵Camera Software Integration2016-07-013-15/+7
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix first-time crash and cleanup permissionsJay Wang2016-06-263-15/+7
| |/ | | | | | | | | | | | | | | | | | | | | As onCreate skips the creation of setting manager when the critical permissions are not granted, this causes the onDestroy to call setting manager destroy function with null pointer. Fix the issue with null check. In addition, remove unused permissions from manifest file Change-Id: I99b5f09449aacfb7eb9a5771e446df75956a9827 CRs-Fixed: 1034202
* | Merge changes I07ef3392,Ie0b04a07 into camera.lnx.1.0-dev.1.0Camera Software Integration2016-07-013-13/+13
|\ \ | | | | | | | | | | | | | | | * changes: SnapdragonCamera: Fix the crash caused by Ubifocus help menu SnapdragonCamera: Adjust the low memory device threshold
| * | SnapdragonCamera: Fix the crash caused by Ubifocus help menuJay Wang2016-06-242-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the Ubifocus UI operation is called from camera thread and caused the exception. To resolve the issue, make sure UI operation is done only in UI thread. Change-Id: I07ef3392577169ecd642bf98a6c39de3580e963d CRs-Fixed: 1032532
| * | SnapdragonCamera: Adjust the low memory device thresholdJay Wang2016-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove Ubifocus and Opti-zoom from the scene mode when the device has memory less than 2GB Change-Id: Ie0b04a0786241fe7ba0035906c4dafe5215dc83e CRs-Fixed: 1003404
* | | Merge "SnapdragonCamera: add jpeg crop parrameter support" into ↵Camera Software Integration2016-07-012-0/+16
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: add jpeg crop parrameter supportJay Wang2016-06-272-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for crop data when sending JPEG encode requests. CRs-Fixed: 993611 Change-Id: Icbd960160d651a3422c2b8530608fcd5dba97735
* | | | Merge "SnapdragonCamera: read jpeg quality from settings before setting." ↵Camera Software Integration2016-07-011-3/+3
|\| | | | | | | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: read jpeg quality from settings before setting.Jay Wang2016-06-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to apply up to date jpeg quality value from SettingsManager before applying to capture request. CRs-Fixed: 993611 Change-Id: Ia335ba346f433f3b05a62676e742ab5a72b8389a
* | | | Merge "SnapdragonCamera: Reorder logic when closing cameras" into ↵Camera Software Integration2016-07-011-30/+34
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Reorder logic when closing camerasJay Wang2016-06-271-30/+34
| | |/ | |/| | | | | | | | | | | | | | | | | | | Re-order calls to unlink all cameras and close sessions before closing any devices. CRs-Fixed: 993611 Change-Id: I0e753a5286799ff59637333cc00231c96709a3e7
* | | Merge "SnapdragonCamera: Fix the camera setting corruption issue" into ↵Camera Software Integration2016-07-014-7/+33
|\ \ \ | |/ / |/| | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix the camera setting corruption issueJay Wang2016-06-214-7/+33
| |/ | | | | | | | | | | | | | | | | | | | | | | Two instances of camera preference were created and caused the wrong preference instance is referenced when changing the camera2 mode. Due to this, it corrupted the camera setting on the other camera device. To resolve the issue, create single instance of camera preference and re-use it. Change-Id: Ia1a6923a10b83e4c5777fb1318677c1f191942fb CRs-fixed: 1025776
* | Merge "SnapdragonCamera: Add touchAE to camera2" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-242-24/+79
|\ \
| * | SnapdragonCamera: Add touchAE to camera2Byunghun Jeon2016-06-212-24/+79
| |/ | | | | | | | | | | | | | | | | Add touchAE to camera by setting AE_Region. It uses the same logic as touchAF to calculate the region. Also fixed the region calculation of AF. Change-Id: Id83f3bd3042d41e2a36c18eb30e476ff1a66dfae CRs-Fixed: 1025759
* | Merge "SnapdragonCamera: Fix slow zooming issue" into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-06-241-5/+3
|\ \
| * | SnapdragonCamera: Fix slow zooming issueJay Wang2016-06-171-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Zoom range calculation didn't give enough precision and caused non-smooth zooming experience. Make the change to keep the full fractional digits. Change-Id: Ib72707e451ea7c4e375d489d183265592622ce0b CRs-Fixed: 1025788
* | | Merge "SnapdragonCamera: skip dual cam crop info in clearsight img" into ↵Linux Build Service Account2016-06-241-9/+89
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: skip dual cam crop info in clearsight imgJay Wang2016-06-211-9/+89
| | |/ | |/| | | | | | | | | | | | | | | | Remove dual cam crop info in Clearsight images. CRs-Fixed: 993611 Change-Id: I9ef6d7b4b5881119bd232648c575c378e8ef9c7d
* / | SnapdragonCamera: fix front back camera toggle crashJay Wang2016-06-212-7/+36
|/ / | | | | | | | | | | | | | | | | | | | | - Fix logic when switching camera id from front to back in dual camera setup. - Only init Clearsight once. - Wait for second surface for aux camera to become ready before attempting to create session. CRs-Fixed: 993611 Change-Id: Icec4af06535f29bc75790b1d57eed212f7a86727
* | Merge "SnapdragonCamera: Fix picture saved when no sdcard inserted" into ↵Camera Software Integration2016-06-201-0/+6
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix picture saved when no sdcard insertedByunghun Jeon2016-06-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix picture being saved when save path is set to sdcard but no sdcard present. In this case, picture should not be saved Check this before taking a picture Change-Id: I7313d67f2f5c489c2db230b8ae165b89ecfbc4c6 CRs-Fixed: 1025784
* | | Merge "SnapdragonCamera: Filter duplicate picture resolution" into ↵Camera Software Integration2016-06-202-1/+2
|\| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Filter duplicate picture resolutionByunghun Jeon2016-06-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Filter picture resolution with duplicate name. There can be 2 different picture resolutions with the same name. Take only the first one. Change-Id: I9a472d958b829d3dce9559d4fcacb5d0dfd3e598 CRs-Fixed: 1025767