summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: Reorder logic when closing camerasJay Wang2016-08-251-30/+34
| | | | | | | | Re-order calls to unlink all cameras and close sessions before closing any devices. CRs-Fixed: 993611 Change-Id: I0e753a5286799ff59637333cc00231c96709a3e7
* SnapdragonCamera: Add touchAE to camera2Byunghun Jeon2016-08-252-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
* SnapdragonCamera: fix front back camera toggle crashJay Wang2016-08-252-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
* SnapdragonCamera: skip dual cam crop info in clearsight imgJay Wang2016-08-251-9/+89
| | | | | | | Remove dual cam crop info in Clearsight images. CRs-Fixed: 993611 Change-Id: I9ef6d7b4b5881119bd232648c575c378e8ef9c7d
* SnapdragonCamera: Fix the camera setting corruption issueJay Wang2016-08-254-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
* SnapdragonCamera: Fix timing of preference initializationByunghun Jeon2016-08-253-10/+19
| | | | | | | Initialize preference before making the views visible. Change-Id: Ie3d541c7fcb29ed86e0e9fd52a1a1e4ea870f009 CRs-Fixed: 982842
* SnapdragonCamera: Fix slow zooming issueJay Wang2016-08-251-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
* SnapdragonCamera: Multiple fixes in SettingManagerJay Wang2016-08-252-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
* SnapdragonCamera: Fix picture saved when no sdcard insertedByunghun Jeon2016-08-251-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
* SnapdragonCamera: Filter duplicate picture resolutionByunghun Jeon2016-08-252-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
* SnapdragonCamera: Fix picture orientationByunghun Jeon2016-08-251-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
* SnapdragonCamera: Add redeye reductionByunghun Jeon2016-08-253-1/+22
| | | | | | | Add redeye reduction to Camera2 Change-Id: Iae4beb9287a0a927330ba987238fac6a2dae058e CRs-Fixed: 1018118
* SnapdragonCamera: Fix initial camera idByunghun Jeon2016-08-253-8/+11
| | | | | | | | Fix initial camera id to proper value. Previously it was always using 0 as initial id Change-Id: Ifc8d63ba2bccb4afcc25445d6713e28732e7deb4 CRs-Fixed: 1018118
* SnapdragonCamera: Fix savepath set to SD card crashByunghun Jeon2016-08-251-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
* SnapdragonCamera: Sharpshooter post filterJack Yoo2016-08-259-37/+299
| | | | | | | Adding Sharpshooter post process filter Change-Id: I8f3c1962db437e7dfbe2973f806a3f9a26480eb7 CRs-Fixed: 1023183
* SnapdragonCamera: Change file naming conventionJay Wang2016-08-252-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
* SnapdragonCamera: FrameProcessorJack Yoo2016-08-2515-30/+944
| | | | | | | Introducing Frameprocessor with beautifiation. Change-Id: Ie6d8f4157a7d0c1a21e6f347457e84685e397286 CRs-Fixed: 1023183
* SnapdragonCamera: PostProcessor and OptizoomJack Yoo2016-08-256-28/+800
| | | | | | | Introducing PostProcessor with Optizoom filter Change-Id: Ib9ac6d4a9526be3a5163d02e298ed783daad48c1 CRs-Fixed: 1023183
* SnapdragonCamera: Fix front camera and scene mode picture taking issuesByunghun Jeon2016-08-254-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
* SnapdragonCamera: Show popup and close when createSession failsByunghun Jeon2016-08-252-40/+59
| | | | | | | | Show popup and close the app when createSession fails. Also modify camera mode related function names. Change-Id: I859af7f0a4e9be86fc8599ff0c3778e5f52f6d0b CRs-Fixed: 1018118
* SnapdragonCamera: Fix clearsight session creation and flashByunghun Jeon2016-08-251-7/+34
| | | | | | | | Fixed flash by waiting for proper AE update result. Fixed clearsight session creation by reducing preview size. Change-Id: I17563bb1b8c107696fc7272bdc21796bb6dfddef CRs-Fixed: 1018118
* SnapdragonCamera: Update settingsManager and add Dual mode to Scene modeByunghun Jeon2016-08-2512-341/+575
| | | | | | | Update settingsManager and add Dual mode to Scene mode Change-Id: I508430840c3fb8c7d0b56a2a63e09b271754fcb4 CRs-Fixed: 1018118
* SnapdragonCamera: Add continuous shot and count downByunghun Jeon2016-08-254-34/+366
| | | | | | | Add continous shot and count down to CaptureModule Change-Id: I986302201f742d7671a67c26953eecc2a0276294 CRs-Fixed: 1018118
* SnapdragonCamera: Add ISO and exposureByunghun Jeon2016-08-255-8/+112
| | | | | | | Add ISO and exposure to CaptureModule Change-Id: If6f3c142bcfbbcc049c10d7be2fe5a4c86d31fe6 CRs-Fixed: 1018118
* SnapdragonCamera: Add SettingsManager, scene, and filterByunghun Jeon2016-08-2526-1593/+2837
| | | | | | | | | | | Add SettingsManager to work as a database for settings. It will handle all dependencies and populate the values. Add scene mode and filter. Restructure UI and menu by combining them and leave the handling of settings to SettingsManager Change-Id: I185163fdddbffd29434e6a9c41b33be6d3388f88 CRs-Fixed: 1018118
* SnapdragonCamera: Enable jpeg encoding via reprocessJay Wang2016-08-254-211/+387
| | | | | | | | | | Enable JPEG encoding via reprocess request for ClearSight routine. Add support for dumping images in NV21 format using persist.camera.cs.dumpyuv CRs-Fixed: 993611 Change-Id: I51ff59ec45bb37059a16197186a9f90bc52554f1
* SnapdragonCamera: Ensure only UI thread accesses Ui elementJay Wang2016-08-251-2/+7
| | | | | | | | Use runOnUiThread to ensure that UI element is accessed only by UI thread. CRs-Fixed: 993611 Change-Id: Ic2faab0813d273140d07f12c5e12a672ce699e1f
* SnapdragonCamera: add OTP calib data support and fix AE stateJay Wang2016-08-253-60/+257
| | | | | | | | | Add support to receive, parse, and send OTP calibration data from HAL to ClearSight library and add check for AE convergence state. CRs-Fixed: 993611 Change-Id: I52d6b71dc7bde4e08342afee7aa9d41bb9a4dde6
* SnapdragonCamera: refactor clearsight code and add persist flagsJay Wang2016-08-254-668/+837
| | | | | | | | | | | | | Move out core ClearSight logic to ClearSightImageProcessor.java Move core ClearSight files to new package: org/codeaurora/snapcam/filter Add persist flags: timestamp difference threshold: persist.camera.cs.threshold burst shot count: persist.camera.cs.burstcount dump source frames: persist.camera.cs.dumpframes CRs-Fixed: 993611 Change-Id: Ic8953a72e8697e494c3ae342bebc70f60540474b
* SnapdragonCamera: Fix AF mode for touch-to-focus and taking snapshotByunghun Jeon2016-08-252-25/+85
| | | | | | | | Use the current AF mode for snapshot. For touch-to-focus, use AUTO mode and reset to CAF after a delay. CRs-Fixed: 989750 Change-Id: I6318b05d57273c0a2fff5b3366faa471f6faaf85
* SnapdragonCamera: Add support for ClearSight captureCullum Baldwin2016-08-258-105/+1234
| | | | | | | Add support to capture ClearSight images. CRs-Fixed: 993611 Change-Id: Ifaeafa53ee5d095fe322e48f968cdeec03c64077
* SnapdragonCamera: Replace SurfaceView with AutoFitSurfaceViewByunghun Jeon2016-08-252-9/+9
| | | | | | | Replace SurfaceView with AutoFitSurfaceView Change-Id: Id4bf27e3b16f12ff4cfdce47224ff871b3981838 CRs-Fixed: 989750
* SnapdragonCamera: Add logic to calculate preview surface ratioJay Wang2016-08-251-0/+76
| | | | | | | | | | | | new file is copied from the commit : 51c65e100d6221c8e19d1345e40db2e7d1c5a190 src/com/android/camera/ui/AutoFitSurfaceView.java copied from media/Camera2Basic/Application/src/main/java/com/example/android/ camera2basic/AutoFitTextureView.java CRs-Fixed: 989750 Change-Id: I29a6fd2219991bda9aaa64f174a61b0aa5b71e87
* SnapdragonCamera: Make switcher visible only when it wasJack Yoo2016-08-251-1/+13
| | | | | | | | Make switcher button be visible only when it was set to be visible in first place. Change-Id: Id0df702b990bbada02ac25eb6981c6bd5e4082b0 CRs-Fixed: 995902
* SnapdragonCamera: Camera2 link bayer monoByunghun Jeon2016-08-251-0/+53
| | | | | | | Link bayer and mono in Camera2 dual mode CRs-Fixed: 989750 Change-Id: I16684f31d75296d4e4daa5b892e9bca06c03b5be
* SnapdragonCamera: Camera2 add touch to focusByunghun Jeon2016-08-254-7/+232
| | | | | | | Add touch to focus to Camera2 CRs-Fixed: 989750 Change-Id: I5c7c85dcc12eefb11e5f1b5e6a823a327b2647e4
* SnapdragonCamera: Camera2 add zoom supportByunghun Jeon2016-08-258-28/+150
| | | | | | | Add zoom support to Camera2 CRs-Fixed: 989750 Change-Id: Id6b558ff5215f04ca7c201b1d1807521d615c353
* SnapdragonCamera: Camera2 add flash, jpeg quality, white balanceByunghun Jeon2016-08-253-123/+391
| | | | | | | Add flash, jpeg quality, and white balance setting menus to Camera2 CRs-Fixed: 989750 Change-Id: I288e1d4378c5e9f471b2b48a6c11ef434a9bac47
* SnapdragonCamera: Camera2 add dual cameraByunghun Jeon2016-08-2510-119/+305
| | | | | | | Add Camera2 dual camera support to SnapdragonCamera CRs-Fixed: 989750 Change-Id: I45a749ad03a531286a39cbfcfdcb65e5cad4759e
* SnapdragonCamera: Add Camera2 modeByunghun Jeon2016-08-2515-6507/+1001
| | | | | | | Use camera2 API to show preview and take snapshot CRs-Fixed: 989750 Change-Id: I07e2d6743529b3d3d5acecf667e9493465a094c9
* SnapdragonCamera: create base files for camera2 APIJay Wang2016-08-254-0/+7990
| | | | | | | | | | | | | | | | All the new files are copied from the commit : f3448373ef3c92b492ac65a9b4008d45a51f88ee res/layout/capture_module.xml copied from res/layout/photo_module.xml src/com/android/camera/CaptureMenu.java copied from src/com/android/camera/PhotoMenu.java src/com/android/camera/CaptureModule.java copied from src/com/android/camera/PhotoModule.java src/com/android/camera/CaptureUI.java copied from src/com/android/camera/PhotoUI.java CRs-Fixed: 989750 Change-Id: I4a97975ed5847d9025f9ff8e8fcbcbeaedd49e16
* SnapdragonCamera: Adding PRIVILEGED trueJack Yoo2016-08-251-0/+1
| | | | | | | Promoting privilege for direct SD card path access. Change-Id: I10f28606a646a85c0cb23e4cf8e617eafdcaa2b4 CRs-Fixed: 1032564
* SnapdragonCamera: Fix first-time crash and cleanup permissionsJay Wang2016-08-213-13/+3
| | | | | | | | | | | 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
* Snap: Fix bad merge of "Fixed M permission issue"Michael Bestas2016-08-211-7/+7
| | | | Change-Id: I493cac1abc38323a4f91506898d25b4f9aea1c79
* Snap: Make developer menu more accessibleMichael Bestas2016-08-203-25/+58
| | | | | | | | | | | | | | * Not all devices have red eye reduction, which made it impossible to enable advanced options. Move the toggle to max brightness option which is present in all devices. * Allow enabling advanced options through camcorder settings. * Move hardcoded strings to cm_strings for translations. * Close menus when developer mode is toggled so we can see the extra options when the menu is reopened. * Decrease taps to 7, matching Settings tap-to-enable. * Properly reset tap counter. Change-Id: Iac39b9309388b92bf75a49a6091b483b13bd9154
* SnapdragonCamera: Force removing preview cover for camcorderJay Wang2016-08-182-1/+14
| | | | | | | | A workaround to remove preview cover when starting recording, if preview cover is not removed right after preview started. Change-Id: I0870ddeec9d3f40a1459315e91e5230155be9f13 CRs-Fixed: 1016691
* SnapdragonCamera: Fix NPE caused by empty permission resultJay Wang2016-08-181-8/+12
| | | | | | | | | When request permission is cancelled, it returns empty result. Making change to check the length of result before accessing the result. Change-Id: Ic3e35c822e053fac7786d5e924ead8935feb1794 CRs-Fixed: 1041464
* snap: Change to target SDK 23Steve Kondik2016-08-181-1/+1
| | | | Change-Id: I0260710461d61d48211fe8a9efdeb5d192f862ff
* SnapdragonCamera: Remove custom location permission request windowJay Wang2016-08-189-67/+136
| | | | | | | | When user enables the GPS locaion setting, use Android's run-time permission request interface to get the permission. Change-Id: Ib17171aeff5ccf20e2b00da08243dee1a3383611 CRs-Fixed: 1038039
* Minimum viable Android M runtime permissions handling for H.zafir2016-08-186-6/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) Fixes to M permissions. 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) SnapdragonCamera: Fixed M permission issue - 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 snap: Remove platform signature * We are using runtime permissions now. Change-Id: I3386214dbbc0915251941ef490e7cbaf27e6ed45