summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Snap: Fix NPE when switching video effects and click on screenjumoog2015-09-191-2/+5
| | | | * Check if mMenuLayout is null, like in 23901e48 for PhotoUI
* SnapdragonCamera: Reset camera state after taking pictureSultanxda2015-09-191-0/+5
| | | | | | mCameraState gets stuck to SNAPSHOT_IN_PROGRESS after taking a picture using autofocus/not ZSL, thus breaking camera capture. Properly reset the camera state after taking a picture to fix this.
* SnapdragonCamera: Quick icon disappear after stop record by home keykaiyiz2015-09-171-0/+1
| | | | | | | | | | | | | | Color effect and switch camera icons disappear if re-launch camera after press home key during recording video. The icons are hided when start record video, but show icons aren't called after stop video record by press home key. Show and hide icons should always be called when stop and start record video, so move the functions to stopVideoRecord and startVideoRecord. Change-Id: Ie4fe9102e226452502fcc382329cc0e01799b0cf CRs-Fixed: 777114
* Snap: Cleanup video profile handlingMichael Bestas2015-09-173-56/+24
| | | | | | | | | | | | | | * Fix camcorder crashes on older devices Revert "SnapdragonCamera: Fix compatibility issues with KK." This reverts commit 0d33346534a728a1f8efaec05fcdccbe3e5440e1. Revert "SnapdragonCamera: Throw error popup for unsupported video profile." This reverts commit 3e50703cff0bc243b922a2299c58a45a4cbd91a9. Change-Id: I1152180a590650a7583430936f3759d1831e91dd
* Snap: fix NPE if device doesn't support AE bracketingLuca Stefani2015-09-171-2/+2
| | | | Change-Id: I44a19b1508cb58a4f249dd00bc9038a069f9db62
* Camera: remove fine/normal/superfine jpegquality and use always intLars Greiss2015-09-172-47/+22
| | | | | | | | | | | We use now a set of int values the user can exactly assign. Showing as well the normal fine superfine as choice is just a duplicate. As well we can get rid of the weird converts of the mixed values. To take care that the user does not get into problems we updated the db version and we make a convertion. Change-Id: I2615666bc1c929c0c045840fad1ece55fb0640af
* Camera2: Add option to set max screen brightnessMichael Bestas2015-09-177-3/+40
| | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
* Camera2: Headset shutter modeDave Daynard2015-09-173-0/+16
| | | | | | | Use play button on headset to take a picture/video/panorama Use media next/previous for zoom Change-Id: I25c22646b041e5e0941fbe361eccfe77a2a1e42f
* Camera2: tweak volume key zoom and cleanupLars Greiss2015-09-174-43/+27
| | | | | | | | | - cleanup unused code - cleanup codestyle - add more zoom steps for smother zooming - show zoom circle indicator during zoom Change-Id: I5214fc2620a0c5167bfdc8e85f7115966c3b8bcf
* Camera: Handle keys only while in appMichael Bestas2015-09-173-11/+25
| | | | | | Thanks to Lars Greiss (SlimRoms) Change-Id: I63f757d25260fba4683f494f8b4daf178a2b4e13
* Camera: Cleanup hardware key handlingMichael Bestas2015-09-176-15/+100
| | | | | | | | | | | | | | | | | * Fix power shutter behaviour in camcorder mode * Disable volume change while in panorama mode, volume buttons should only handle camera operations while in the camera * Add camera/power/volume key shutter handling in panorama mode On devices with a hardware camera key: * Disable power & volume shutter features * Volume buttons control the zoom On devices without a hardware camera key: * When power shutter is disabled, volume buttons control the shutter (like AOSP) * When power shutter is enabled, volume buttons control the zoom Change-Id: I141946d5b6f5aec8b1e9a9f99270d30295596079
* Camera: Powerkey shutter (2/2)Michael Bestas2015-09-177-3/+66
| | | | | | | | | | | | | | Ported from cm-10.1 Including cm-10.1 camera commit: aa4ae80a41fbab763891c5ef6d67a9e5b4bb981b Don't mess around with pref local ID for power shutter initialization. Includes http://review.cyanogenmod.org/56986 [mikeioannina]: Updates for L Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
* Camera2: implement volume key zoom in video modejt11342015-09-172-0/+25
| | | | Change-Id: I140e8cfb3e39700f60e40c35b38e92c83a3c26de
* Camera: Change volume hard key button to zoom functionSu Liu2015-09-174-5/+80
| | | | | | | | Able to capture image through volume hard key button in camera application, change the function to zoom function. Change-Id: Iab9fc2492b2e2ff89cd58c21bac2f147f47b77e2
* Revert "SnapdragonCamera: Forbid volume key can take picture"Michael Bestas2015-09-172-9/+1
| | | | | | This reverts commit e73e717b8be1ba834161914af4debc61c1feb8be. Change-Id: Iee719f34f6016f89ec0bb1c078bfa25c2f718436
* Camera: separate settings for color effectsjt11342015-09-173-4/+5
| | | | | | | Store color effect settings for the camera and video camera in their own separate preferences. Change-Id: I8faa59b8663154737910b338906d27f9736d5ad9
* Camera2: implement exposure compensation settings in video modejt11342015-09-173-0/+26
| | | | Change-Id: I83a2675e109dc7924cdd9240b26051ac218f532a
* Camera2: Remove CAF video duration codeMichael Bestas2015-09-173-42/+1
| | | | Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
* Camera2: Don't report incorrect supported picture formatsLars Greiss2015-09-171-1/+1
| | | | | | | | | | | If camera HAL does not return valid picture formats do not show wrong defaults Currently it falls back to jpeg and raw to choose for the user. All our devices which do not have a proper return of picture format only support jpg. So remove the entry to choose in this case completely Change-Id: Ib4e4094ba0a57e7751f6568f6ec3c3f1dfc1ffb8
* camera: Make some parameter lookups saferSteve Kondik2015-09-171-21/+45
| | | | | | | | * Unsupported parameters that return int values will throw an exception at the framework level if they aren't supported. Handle this better and prevent crashes. Change-Id: If5a3807dba33167ef95e4ec9e9cbeb15ed4ed591
* Camera: Fix saturation, contrast, sharpness parametersEthan Chen2015-09-172-6/+6
| | | | | | | * Old-style QCOM HALs use <setting>-max, new style HALs use max-<setting> for these parameters. Change-Id: I3b0dbd04f072cb69d09c44b5b3af1097560205b3
* Camera2: More thorough compatibility fixesRyuinferno2015-09-172-6/+12
| | | | | | | Certain chipsets (such as omap) have contrast, sharpness and saturation set, but no max integer given for those Change-Id: I58efaef4d0a511aefc803a440e0c3aa3dbdc9483
* Camera: fix preview for landscape devicesPawit Pornkitprasan2015-09-173-9/+9
| | | | | | | | | | Landscape devices have broken preview because PORTRAIT mode is being abused to check for screen rotation. Use proper rotation check to fix. Ported from cm-10.2 Change-Id: I75588cbce9843e180e4be7591f6a43bcec788506
* Camera2: Preview needs to be stopped when changing resolutionPawit Pornkitprasan2015-09-171-0/+6
| | | | | | | | This was done in startPreview as a hack, but was removed in f729b85e12cfa2674048d8cce2f724014b8fc910. Specifically add it back when the resolution is changed. Change-Id: I306abd788bafdff4e6fba7eec4e6ff05bb3cc47c
* camera: Remove ICS hack to stop preview after takePictureSteve Kondik2015-09-171-6/+0
| | | | Change-Id: Idcecfc6399421bd5dc25dcf79548949cdd14621f
* camera: Proper fix for the missing video-sizes issueSteve Kondik2015-09-171-2/+5
| | | | | | * Just honor the defined camcorder profiles. Change-Id: I83e8fe2ca9bb489332f37767906bc7c56389f949
* camera: Check if video sizes are availableSteve Kondik2015-09-171-2/+3
| | | | | | | * Some drivers don't report video sizes and we should avoid using fine resolution lookup, otherwise a crash results. Change-Id: I8010e66d1a3a5e6f8a505ff3b50146cd24fc2b9c
* Camera: Add red-eye flash mode supportMichael Bestas2015-09-171-1/+3
| | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I3db982732d15fb4eb83d5e37bff1a123225d4e8e
* camera: Add all resolutions, focus modes, scene modes, and color effects.Steve Kondik2015-09-171-4/+2
| | | | Change-Id: I255d73b6e221655f9592047ccf848460d985c3b3
* camera: Remove the luma-adaptation seekbarSteve Kondik2015-09-171-82/+0
| | | | | | * Not useful for any hardware I have encountered. Change-Id: I93cca2b3bf907cc01946a55111de9eb883475d24
* camera: Cleanup and compatibility fixesSteve Kondik2015-09-174-29/+67
| | | | | | | * Don't crash for unavailable integer parameters * Kill logspam Change-Id: I6dbcf5560f96ce6173a847501721f589766889bc
* camera: Add parameter debugging supportSteve Kondik2015-09-173-6/+26
| | | | Change-Id: Ifc1653f0046af169ba36d94796b4d9a3055c6798
* SnapdragonCamera: Hide UI after error-checking video preferencesSultanxda2015-09-171-1/+2
| | | | | | | | | | * Hiding the UI before error-checking the video preferences when video recording starts results in a broken UI when one of the error cases evaluates to be true. * Hide the UI after the error checking to prevent the UI from breaking when an error is found. Change-Id: Ia98798dbf2a33800d47497630714af17865767c6
* SnapdragonCamera: Re-enable ZSL after exiting HDR modeSultanxda2015-09-171-0/+4
| | | | | | * Make sure to check that HDR was changed before forcing ZSL back on. Change-Id: Ifb76263c3a50b919762fd2a313d6013295c0619f
* SnapdragonCamera: Initialize overlay before control-by-intentSultanxda2015-09-171-1/+1
| | | | | | | | * initializeControlByIntent() expects mVideoMenu to not be null and initializeOverlay() initializes mVideoMenu when it isn't null * Change the order the functions are called to prevent possible NPE Change-Id: I6d240892f3bd318031983243760d87ab46b25edb
* Snapdragon Camera: Use consistent API for preview fps resetEmilian Peev2015-08-292-5/+12
| | | | | | | | | | Instead of using preview fps range API during preview framerate reset use the fixed fps API. This is to avoid any inconsistent behavior that can be triggered when using both APIs from MediaRecorder and Snapdragon application side. Change-Id: Ib5251d8ea4d697db9bdea4e5ebf20606b286f54f
* Snapdragon Camera: Avoid possible race conditionEmilian Peev2015-08-291-0/+9
| | | | | | | | | | | | | | | | | | Camera open and preview start are currently executed in a separate thread different from the main handler thread. If the main thread tries to switch the camera immediately after the open camera thread starts a race condition is possible. This race condition can lead to a failing assert in CameraHolder which can receive two camera open requests one after another. To resolve this the main handler thread needs to check whether an open camera thread got initialized and started previously. If the check is positive, it needs to wait until the separate thread finishes before proceeding with the camera switch sequence. Change-Id: I409e3158bc976120de31540351ea8e55fddbca46
* Validate preview format before setting it to camera device.Santhosh Kumar H E2015-08-292-2/+14
| | | | | | | | | For 720p and 1080p video resolutions, nv12_venus preview format is being set. But few targets doesn't support this preview format. So validate the preview format with supported list before setting it to camera device. Change-Id: I29b3b2b412b04abf82c61c732414e00aa1bff243
* Camera: Set preview fps after recording.Suman Mukherjee2015-08-291-0/+12
| | | | | | | | 4k DCI recorded FPS is getting picked up from profile and not getting reset to preview FPS after stop recording. Fix made to set the preview FPS range after stop recording. Change-Id: I4892e6fcee3eefbcbd6ca9426e56e2303cdad844
* Initialize focus overlay manager if it is not initialized.Santhosh Kumar H E2015-08-291-3/+9
| | | | | | | | | | | Camera open thread initializes the focus overlay manager after opening camera. In a rare scenario above background thread had not initialized focus overlay manager by the time UI thread start acessesing it, so we see a crash. Initialize focus overlay manager from UI thread if it is not initialized already. Change-Id: I1635c8759d0e0647fe61fe975a0cc24df40df529
* Camera2: Disable SeeMore feature during 4K videoShwetha Kotekar2015-08-291-2/+13
| | | | | | | If the video resoultion is 4K, disable SeeMore and show a toast message Change-Id: Ieb947f889d92fb8f9af5bf52c865555dce7eb1c4
* Rename SnapdragonCamera to SnapMichael Bestas2015-08-293-3/+3
| | | | Change-Id: I1474550af7f45e53aa97819b42a91c961eeb6684
* Merge fa458f0a64a6b4412912c9177ec0fbeed084a28f on remote branchLinux Build Service Account2015-08-063-167/+152
|\ | | | | | | Change-Id: Ib0ecc314a7bd0b76c8e955402d9adfe0a4989223
| * SnapdragonCamera: remove nav bar to enable full screen previewByunghun Jeon2015-08-033-167/+152
| | | | | | | | | | | | | | Remove the navigation bar in order to take advantage of full screen. Change-Id: I25f42af825c4f3b7ad6521c2ee6d62fa4219044a CRs-Fixed: 865254
* | Revert "SnapdragonCamera: Move focus mode to developer mode"Gopal G Goberu2015-08-031-1/+2
| | | | | | | | | | | | This reverts commit 4d37b1187636819cc06ef099fdf2ac7a5fec49f5. Change-Id: I58866cba3af38dee6416714be7458d766f7560ce
* | Revert "SnapdragonCamera: Reduce number of countdown timer option"Gopal G Goberu2015-08-031-2/+2
| | | | | | | | | | | | This reverts commit 57d77499b09d207187c8a1051bf043ba9fb43c84. Change-Id: I91faf90357f5563e594756c0b7a942c34bbee344
* | Merge 5c05aaa8664172755c0f5cf6920e518a8abca067 on remote branchLinux Build Service Account2015-07-271-2/+1
|\ \ | | | | | | | | | Change-Id: I4b111d981352b99ff7f9e6c2dc43915d30aef16b
| * | SnapdragonCamera: Move focus mode to developer modeByunghun Jeon2015-07-141-2/+1
| | | | | | | | | | | | | | | | | | | | | Move focus mode to developer mode since it cannot be selected unless ZSL is turned on which is also in developer mode Change-Id: Id441da1c706f8151df2fc291247e8267428d19b6
* | | SnapdragonCamera: honor video duration limit in intentLikai Ding2015-07-231-10/+8
| | | | | | | | | | | | | | | | | | | | | The video duration limit read from intent is later overwritten by the value from preference. Change the order to honor the intent value. Change-Id: I833b1fbcecbbaeff48ff51144f5e584e91fb1838
* | | Merge "SnapdragonCamera: Don't disable the camera"Linux Build Service Account2015-07-232-2/+2
|\ \ \