summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
* | | Merge "SnapdragonCamera: Fix picture orientation" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-201-3/+1
|\| |
| * | SnapdragonCamera: Fix picture orientationByunghun Jeon2016-06-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix picture orientation when device is in landscape. We need to use mOrientation for calculating proper orientation for jpeg because this field contains the right orientation information (portrait/landscape) Change-Id: I25137265c1037a6121e0e89828b78dd4bc1c35d4 CRs-Fixed: 1018118
* | | Merge "SnapdragonCamera: Add redeye reduction" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-203-1/+22
|\| |
| * | SnapdragonCamera: Add redeye reductionByunghun Jeon2016-06-093-1/+22
| | | | | | | | | | | | | | | | | | | | | Add redeye reduction to Camera2 Change-Id: Iae4beb9287a0a927330ba987238fac6a2dae058e CRs-Fixed: 1018118
* | | Merge "SnapdragonCamera: Fix initial camera id" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-203-8/+11
|\| |
| * | SnapdragonCamera: Fix initial camera idByunghun Jeon2016-06-093-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | Fix initial camera id to proper value. Previously it was always using 0 as initial id Change-Id: Ifc8d63ba2bccb4afcc25445d6713e28732e7deb4 CRs-Fixed: 1018118
* | | Merge "SnapdragonCamera: Fix savepath set to SD card crash" into ↵Camera Software Integration2016-06-201-5/+21
|\| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix savepath set to SD card crashByunghun Jeon2016-06-091-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crash issue when fix savepath is set to SD card and the app is restarted. This is due to not updating storage information. When the module starts up, we need to call storage update so that it will set to proper initial value, not causing crash. Also only update focus UI when AF state is not null. Change-Id: I1a3e444b42eb988ed622d047b1f3dc42bec7a119 CRs-Fixed: 1018118
* | | Merge "SnapdragonCamera: Sharpshooter post filter" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-2010-38/+300
|\| | | |/ |/|
| * SnapdragonCamera: Sharpshooter post filterJack Yoo2016-06-0810-38/+300
| | | | | | | | | | | | | | Adding Sharpshooter post process filter Change-Id: I8f3c1962db437e7dfbe2973f806a3f9a26480eb7 CRs-Fixed: 1023183
* | SnapdragonCamera: Multiple fixes in SettingManagerJay Wang2016-06-152-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | - Setting manager instance was not destroyed when camera activity onDestroy is called and a new instance is created again when onCreate is called. Make change to destroy the setting manager during onDestroy. - Include high resolution picture sizes to the picture size list Change-Id: Id6cb52da1419f7e723304236b5d2c204d217398c CRs-Fixed: 1025845, 1025789
* | Merge "SnapdragonCamera: Change file naming convention" into ↵Camera Software Integration2016-06-112-41/+40
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Change file naming conventionJay Wang2016-06-062-41/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change logic to generate common file name to be used for all dumped frames. Decouple YUV and JPEG dump set props so that they can be toggled independently. CRs-Fixed: 993611 Change-Id: I3e985e2fe55e116529929e36fb26c3760f47a536
* | | Merge "SnapdragonCamera: Fixed M permission issue" into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-06-103-33/+43
|\ \ \
| * | | SnapdragonCamera: Fixed M permission issueJay Wang2016-06-023-33/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Resolved NPE while sending permission request - Made change to request non-critical permissions once only, but the critical permssions all th time. - Removed unused contant defines CRs-Fixed: 1019847 Change-Id: Ib997244cbcc041d86c094c7ee7a902bff56e92ad
* | | | Merge "Fixes to M permissions." into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-06-102-5/+28
|\| | |
| * | | Fixes to M permissions.zafir2016-06-022-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called PermissionsActivity with startActivityForResult(). However, this creates race conditions as we check for permissions and the CameraActivity continues to operate. Now, we end CameraActivity and launch a new instance upon successful permissions resolution. We can also put the preload filmstrip logic back in its original place in onCreate. The checks for permissions happen in both onCreate and onResume. Bug: 22442745, 22478144, 22497152 CRs-Fixed: 1019847 Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0 (cherry picked from commit ac0e2425e77a9b69e76d2f31876798825ea44584)
* | | | Merge "Minimum viable Android M runtime permissions handling for H." into ↵Linux Build Service Account2016-06-104-1/+223
|\| | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | Minimum viable Android M runtime permissions handling for H.zafir2016-06-024-1/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates new activity for permissions handling: both checking for permissions and handling error condition when critical permissions are not present. The reason for creating a new activity is so the app does not attempt to continue executing OnCreate, OnResume etc, which opens the camera while the dialogs are showing. This should not slow the app down because the permissions activity will only run when a) the first time the app has insufficient permissions and b) when a critical permission is missing and the app needs to shut down. Bug: 21273463 CRs-Fixed: 1019847 Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5 (cherry picked from commit ad44cda82fe6ec5ee090115129223c6314f9e1bb)
* | | | Merge "SnapdragonCamera: Using reflection to remove compilation error" into ↵Linux Build Service Account2016-06-102-2/+14
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Using reflection to remove compilation errorSanjeev Garg2016-06-062-2/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: Currently the camera app is being used across multiple PLs, which are on different android versions (Android M, N). There are different variables being used for h256 across different android framework - M and N. Hence using one variable name is causing compilation error in other android version Fix: Using java reflection to access variables to avoid any compilation dependency on different android versions CRs-Fixed: 1015477 Change-Id: I68519223dbe9825e8b1a7f5d1a8e509713a743c6
* | | | Merge "SnapdragonCamera: Fixed NPE during camera resume" into ↵Linux Build Service Account2016-06-101-1/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fixed NPE during camera resumeJay Wang2016-06-011-1/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a race condition that mMenu is not initialized before UI thread accessing the object. This can happen if the initialization of UI thread is completed before camera thread opens the camera device. Since the camera mMenu instance is created in the callback of onCameraOpened(), UI thread needs to check if mMenu is initialized or not before accessing it. Change-Id: Ic8ffc50b7334714de9a57b22f8229bc0ce868901 CRs-Fixed: 1013999
* | | Revert "SnapdragonCamera: Use mediarecorder resume instead of start"Camera Software Integration2016-06-081-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit ebf9dcc648cb5faade3a59d155f696e7927923d0 Change-Id: I335aea386ee457063ccd04f3f15095e3f5a3f797
* | | Merge "SnapdragonCamera: Use mediarecorder resume instead of start" into ↵Camera Software Integration2016-06-071-1/+1
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Use mediarecorder resume instead of startSanthosh Behara2016-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For camcorder to resume after pause use mediarecorder's resume() API instead of start() API Change-Id: Ieb6e2c681ed5403b26bfc522c7dfef41104e3653
* | | | Merge "SnapdragonCamera: Add manufacture and model info" into ↵Camera Software Integration2016-06-072-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Add manufacture and model infoJay Wang2016-05-092-0/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manufacture and model information is added to the EXIF tag of saved panorama image file Change-Id: Ie5688032abc2278718dfcc0bf9129a35dedc7b8b CRs-Fixed: 1011930
* | | | Merge "SnapdragonCamera: FrameProcessor" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-0715-32/+944
|\ \ \ \
| * | | | SnapdragonCamera: FrameProcessorJack Yoo2016-06-0115-32/+944
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introducing Frameprocessor with beautifiation. Change-Id: Ie6d8f4157a7d0c1a21e6f347457e84685e397286 CRs-Fixed: 1023183
* | | | | Merge "SnapdragonCamera: PostProcessor and Optizoom" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-076-28/+800
|\| | | |
| * | | | SnapdragonCamera: PostProcessor and OptizoomJack Yoo2016-06-016-28/+800
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introducing PostProcessor with Optizoom filter Change-Id: Ib9ac6d4a9526be3a5163d02e298ed783daad48c1 CRs-Fixed: 1023183
* | | | | Merge "SnapdragonCamera: Fix front camera and scene mode picture taking ↵Camera Software Integration2016-06-074-17/+61
|\| | | | | | | | | | | | | | | | | | | issues" into camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Fix front camera and scene mode picture taking issuesByunghun Jeon2016-05-314-17/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix front camera picture taking issues. Fix scene mode picture taking issues. For both front camera and scene mode issue, focus state was not updating properly so it was stuck waiting for focus to finish. So added another logic to check such case and continue to next step. Change-Id: I99d2164a77cc2903f3df50c7ff9478e718b112c0 CRs-Fixed: 1018118
* | | | | Merge "SnapdragonCamera: Show popup and close when createSession fails" into ↵Camera Software Integration2016-06-072-40/+59
|\| | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Show popup and close when createSession failsByunghun Jeon2016-05-312-40/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show popup and close the app when createSession fails. Also modify camera mode related function names. Change-Id: I859af7f0a4e9be86fc8599ff0c3778e5f52f6d0b CRs-Fixed: 1018118