summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
Commit message (Collapse)AuthorAgeFilesLines
* Snap: Add support for focus distanceSteve Kondik2019-11-091-0/+16
| | | | | | * Hook up available metadata to the new focus manager. Change-Id: I793df67a2682d8bb2dee994193111227dd8c8d5a
* Drop new focus indicator into Camera2.Paul Rohde2019-11-091-2/+1
| | | | | | | * Create a new custom focus view that interacts with physical lens diopter changes. * Replace all occurances of the old focus indicator with the new one. Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
* Snap: Don't do touch-to-focus on top of UI elementsSultanxda2019-10-251-1/+1
| | | | | | | | Don't process touch-to-focus for taps that are located on either the top or bottom UI panes. Change-Id: Iac4ccda8625080ff0bd1133ac339e53c423b626d Signed-off-by: Sultanxda <sultanxda@gmail.com>
* VideoModule: don't set negative HFR valueAnas Karbila2019-10-251-1/+5
| | | | | | Change-Id: Ic5e429c16792af7f3af0155f50c162487ffa4ef7 (cherry picked from commit 460c0f207ad453473a1d2d5f0f94651578f5eccb) Signed-off-by: Alex Naidis <alex.naidis@linux.com>
* Snapdragon Camera: Use consistent API for preview fps resetEmilian Peev2019-10-251-5/+3
| | | | | | | | | | 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
* Camera: Set preview fps after recording.Suman Mukherjee2019-10-251-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 manager in onResume().Danny Baumann2019-10-251-0/+1
| | | | | | | | | | | Since commit 87b4a40d588a7ae8a61cb353c4cff8df37f7b483 moved camera initialization (and focus manager initialization with it) to a background thread, the focus manager initialization now races against the onPreviewRectChanged() call triggered by SurfaceView initialization in the main thread, potentially leaving the focus manager in an uninitialized state that prevented taking pictures. Change-Id: I8cf650d6a67768acd131b3cddad175ed198e0838
* Grant read URI permission for playback of video captureAlan Newberger2019-10-251-0/+1
| | | | | | | | | | | Current implementation of video capture UI configured MediaRecorder to output directly into supplied URI, which per recommendation should be a content: URI. We pass this URI to another app to play back the video, and should pass along the read permission. Bug: 19675889 Change-Id: Idfc0ee42422dde5d921e81f098d4697e652ac689
* Remove unused menu indicators code.Danny Baumann2019-10-251-6/+0
| | | | Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
* Snap: Separate default focus time between camera/videoSultanxda2019-10-251-1/+1
| | | | | | | | | | | | | | For the camera, the user expects a default tap-to-focus duration of 3 seconds with exposure locking. For the camcorder, however, the user expects a tap-to-focus duration of 0 seconds with no exposure locking, as the rapid change in exposure while recording would negatively impact the video. Separate the tap-to-focus option to reflect the recommended defaults. [mikeioannina]: Adapted to Snap Change-Id: I75bc0610f5d301c9728b4bc104b86e0fab5493fb Signed-off-by: Sultanxda <sultanxda@gmail.com>
* Snap: Add ability to set the tap-to-focus duration to 0 secSultanxda2019-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Author: Sultanxda <sultanxda@gmail.com> Date: Sun Dec 6 10:30:28 2015 -0800 Snap: Add ability to set the tap-to-focus duration to 0 sec Setting a tap-to-focus duration of 0 seconds allows for a quick, manual refocus of the subject without interfering with the exposure. This is particularly useful when recording videos. Change-Id: Ie3d92e50f755c938e9725438ba5baad0d0985485 Signed-off-by: Sultanxda <sultanxda@gmail.com> Author: Michael Bestas <mikeioannina@cyanogenmod.org> Date: Tue Feb 9 18:51:28 2016 +0200 Snap: Fix crash when set infinite touch-focus duration * java.lang.Integer.valueOf(string) method can't parse hexadecimal values Change-Id: I42706db72fc9c1093a7aa16440af449f731e5176 Change-Id: I9ae88f55a452a66af39906d46f1b899130199da2
* Snap: Add focus time support in camcorderMichael Bestas2019-10-251-0/+5
| | | | Change-Id: I5432554a40d7375ed7893c38cb2741a12cc8cc80
* SnapdragonCamera: Lock AE and AWB for tap-to-focus in camcorderSultanxda2019-10-251-0/+20
| | | | | | | | Lock the auto exposure (AE) and auto white balance (AWB) when tap-to-focus is used in the camcorder. Change-Id: Ieb24e04b74a06b2390eb9302e74b4f69b1486951 Signed-off-by: Sultanxda <sultanxda@gmail.com>
* SnapdragonCamera: Add focus-mode option to camcorderSultanxda2019-10-251-2/+5
| | | | | | | User can now control the focus mode used while recording video. Change-Id: I340c01a3f88314de67ca024279672276eff453ed Signed-off-by: Sultanxda <sultanxda@gmail.com>
* camera: Touch focus support for camcorderSteve Kondik2019-10-251-8/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Steve Kondik <shade@chemlab.org> Date: Wed Aug 28 14:21:49 2013 +0800 camera: Touch focus support for camcorder * Available when video snapshots are not supported. * Original from CodeAurora Forum. Change-Id: I232c178430db08e7366aa9f91b4926d07e7c225d Author: Dheeraj CVR <cvr.dheeraj@gmail.com> Date: Sat Apr 19 02:33:46 2014 +0530 Camera2: Prevent autofocus when video snapshot is in progress During video recording if screen is tapped repeatedly, autofocus is started while the snapshot is taken. This would either result in an out of focus snapshot which would also disturb the focus in the recorded video or crash the sensors that can't handle autofocus during snapshot. Change-Id: If2763094f5ab7536e4409469276de54580e803c8 Author: Dheeraj CVR <cvr.dheeraj@gmail.com> Date: Mon Jun 23 22:00:07 2014 +0530 Camera2: Prevent propogating CancelAutoFocus during Video Recording When AutoFocus is started during Video Recording, CancelAutoFocus is called after KEY_FOCUS_TIME seconds. CancelAutoFocus has the side effect of resetting the sensor AF position and will result in instant loss of focus which is not a desired event when AF is manually triggered in case of Video Recording. Change-Id: Icee7f6dfd4ad083c9b383ee2a4df6a34e4668de6 Author: lion0738 <lion0738@naver.com> Date: Sun Jan 10 16:55:01 2016 +0900 Snap: Set parameters before starting preview Old parameters are used when grabbing focus mode. Camera parameters should be set to FocusOverlayManager before starting preview. Change-Id: I908559e1c2003be47b486996b0ec016b78107468 Change-Id: I8be16315ccede388e590e81e93f0dd417ae51c4a
* Add orientation correction for landscape devicesandralex82019-10-251-3/+8
| | | | | | | | | | | | | Snap does not correctly handle devices with a landscape screen as rotation is 0 when device is in landscape while Snap assume that 0 is portrait. This lead to a rotated gui and a deformed preview. This commit: - Solve the gui rotation for Photo, Video and Panorama modules - Solve the deformed preview for Photo and Video (Panorama preview was ok with gui fix) - Solve the PhotoMenu rotation (all devices, it was also broken on portrait devices) Change-Id: Ic0b95904da6e13946c7e46e2e571b26da498db02
* SnapdragonCamera: Scale up bitrate for HSR recordingsSultanxda2019-10-251-1/+2
| | | | | | | | | | Currently, bitrate is only scaled up for HFR (slow-mo) recordings, not HSR (full high-speed) recordings. Scale up the bitrate for HSR to prevent video-quality degradation. Change-Id: Icc009ad4b22d990cc6df6773d965579a7d9cb091 Signed-off-by: Sultanxda <sultanxda@gmail.com>
* SnapdragonCamera: Add option to control antibanding in camcorderSultanxda2019-10-251-16/+7
| | | | | | | The antibanding setting in camcorder is linked to the setting in camera mode for better UX (if you change one, the other will change accordingly). Change-Id: I98c1bc65472cf8eec530f5a7572f46458b0ab3fa
* Snap: Actually select the highest quality video by defaultChristopher R. Palmer2019-10-251-1/+1
| | | | | | | | | | | Prior to this commit Snap assumes that the HAL returns the list of supported video sizes in descending order of quality and simply picks the first one from the list as the default quality. Instead, find the first matching entry of pref_video_quality_entryvalues that the HAL indicated was supported. Change-Id: Ifea79e0e16a9015557539e098317536a32b9ff1f
* Snap: Fall back to default quality for invalid video qualitiesMichael Bestas2019-10-251-3/+2
| | | | | | Might happen when updating from previous versions of Snap Change-Id: I42d2037b4e32c7f5c88a60b5da1895dcb761d176
* Camera2: Add option to set max screen brightnessMichael Bestas2019-10-251-0/+4
| | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
* Camera2: Headset shutter modeDave Daynard2019-10-251-0/+6
| | | | | | | Use play button on headset to take a picture/video/panorama Use media next/previous for zoom Change-Id: I25c22646b041e5e0941fbe361eccfe77a2a1e42f
* Camera: Cleanup hardware key handlingMichael Bestas2019-10-251-9/+32
| | | | | | | | | | | | | | | | | * 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 Bestas2019-10-251-0/+10
| | | | | | | | | | | | | | 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
* Camera: Change volume hard key button to zoom functionSu Liu2019-10-251-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Su Liu <suliu@codeaurora.org> Date: Wed Sep 4 18:16:50 2013 +0800 Camera: Change volume hard key button to zoom function Able to capture image through volume hard key button in camera application, change the function to zoom function. Change-Id: Iab9fc2492b2e2ff89cd58c21bac2f147f47b77e2 Author: jt1134 <jt1134@gmail.com> Date: Sat Jan 4 20:52:27 2014 -0600 Camera2: implement volume key zoom in video mode Change-Id: I140e8cfb3e39700f60e40c35b38e92c83a3c26de Author: Lars Greiss <kufikugel@googlemail.com> Date: Sun Feb 2 03:09:22 2014 +0100 Camera2: tweak volume key zoom and cleanup - cleanup unused code - cleanup codestyle - add more zoom steps for smother zooming - show zoom circle indicator during zoom Change-Id: I5214fc2620a0c5167bfdc8e85f7115966c3b8bcf Change-Id: I99dd2fffc92985156eece67c19435a71d14cd928
* Camera: separate settings for color effectsjt11342019-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | Author: jt1134 <jt1134@gmail.com> Date: Mon Jan 20 19:45:13 2014 +0200 Camera: separate settings for color effects Store color effect settings for the camera and video camera in their own separate preferences. Change-Id: I8faa59b8663154737910b338906d27f9736d5ad9 Author: Michael Bestas <mikeioannina@gmail.com> Date: Tue Aug 26 06:11:21 2014 +0300 Snap: Fix filtering of unsupported camcorder color effects Change-Id: I365deeb17995175db873f6799cf0cde43ee61e96 Change-Id: I7ee41923f8a7313eee06d5e0bf7e29a365d0af86
* Camera2: implement exposure compensation settings in video modejt11342019-10-251-0/+22
| | | | Change-Id: I83a2675e109dc7924cdd9240b26051ac218f532a
* Camera2: Remove CAF video duration codeMichael Bestas2019-10-251-18/+0
| | | | | Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2 Signed-off-by: Chippa-a <vusal1372@gmail.com>
* Camera: Cleanup and compatibility fixesSteve Kondik2019-10-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Author: Steve Kondik <shade@chemlab.org> Date: Sat Dec 7 06:07:02 2013 -0800 Camera: Cleanup and compatibility fixes * Don't crash for unavailable integer parameters * Kill logspam Change-Id: I6dbcf5560f96ce6173a847501721f589766889bc Author: Ryuinferno <ryuinferno.xda@gmail.com> Date: Thu Dec 26 19:11:23 2013 +0100 Camera2: More thorough compatibility fixes Certain chipsets (such as omap) have contrast, sharpness and saturation set, but no max integer given for those Change-Id: I58efaef4d0a511aefc803a440e0c3aa3dbdc9483 Author: Ethan Chen <intervigil@gmail.com> Date: Wed Feb 5 23:02:17 2014 -0800 Camera: Fix saturation, contrast, sharpness parameters * Old-style QCOM HALs use <setting>-max, new style HALs use max-<setting> for these parameters. Change-Id: I3b0dbd04f072cb69d09c44b5b3af1097560205b3 Author: Steve Kondik <shade@chemlab.org> Date: Wed Feb 26 07:43:28 2014 +0100 camera: Make some parameter lookups safer * 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 Change-Id: Id1a3e360474f0a8aebe150918d13b0a825715789
* camera: Add parameter debugging supportSteve Kondik2019-10-251-0/+3
| | | | Change-Id: Ifc1653f0046af169ba36d94796b4d9a3055c6798
* SnapdragonCamera: Hide UI after error-checking video preferencesSultanxda2019-10-251-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: Add video encoder bit rate for 3840x2160@60FPSWeijie Wang2017-09-031-1/+4
| | | | | | Add video encoder bit rate for 3840x2160@60FPS Change-Id: Ieb7dc37dc658462b06dd316553fd6478b5132d01
* SnapdragonCamera: Wrapper for QC APIweijiew2017-08-291-32/+41
| | | | | | | | | 1. Wrapper for Parameters 2. Wrapper for CameraInfo 3. Wrapper for CamcorderProfile 4. Wrapper for Camera 5. Wrapper for ExtendedFace Change-Id: I8c8605db3696bffc4d975c0bb6f74944ed23a6bd
* SnapdragonCamera: Fix no flash settings menumingwax2017-04-211-1/+1
| | | | | | | | | (1) When user switch from photo mode to video mode, the object of mParameters should be updated. (2) Set the videoFlash mode values. CRs-Fixed: 2021123 Change-Id: Ie1e3ceba4c2304a57ae2758ab33de08825e72247
* Revert "SnapdragonCamera:Fix no recording thumbnail when capture during ↵junjiez2017-03-211-6/+0
| | | | | | | | recording." This reverts commit 0c38495f9f0aae023de5bdfb0ada2f846000278f. Change-Id: I113f5142fca4bc53163d5de9105fb865b34683b3
* SnapdragonCamera: Add zoom option to developer optionJay Wang2017-02-191-0/+61
| | | | | | | | For automation testing, we need a way to adjust the zoom without using the pinch gesture. Therefore, adding zoom option preference to the developer option. Change-Id: I37f8c1b4f51682cb398d0a5f779f45128bdc19ec
* SnapdragonCamera:Fix no recording thumbnail when capture during recording.pezhan2017-01-161-0/+6
| | | | | | | | | | | The default video file name is generated by the start recording timestamp. Need to use the recording stop timestamp to generate the video file name to rename previous.Then camera will update the media provider when stop recording in order to display the new thumbnail in time. Change-Id: I0d3fd2a66b1a22d3b41c81cf84cca28e77867510 CRs-Fixed: 1104963
* SnapdragonCamera:Improve camera app's robustnessjianhuac2016-12-301-0/+3
| | | | | | | | We just load RenderScript engine once when initialize CaptureModule and destory it when destory CaptureModule, instead of load-destory engine by muti-thread when open-close camera device. Change-Id: I76f9e5f99061fb1557624ab683c37837ae1414f7
* SnapdragonCamera: GPS location can't be turn On in camera settingsweijiew2016-11-241-2/+4
| | | | | | | | | In Camera2, SharedPreferences persistes GPS location value by key(pref_camera2_recordlocation_key), but gets GPS location value by key(pref_camera_recordlocation_key). CRs-Fixed: 1088262 Change-Id: I33ddeb8f20fed03449bded2760c0ad1b8e36c91c
* SnapdragonCamera: Adjust video encoder bit rate and add 60fps supportJay Wang2016-11-071-1/+12
| | | | | | | | - Configure the video encoder bit rate to the recommended value - Add 60fps video frame rate support Change-Id: I477487c4c4fab5479534896d90e08c3eadddc54f CRs-Fixed: 1074187
* Merge "SnapdragonCamera:Force close when set video high framerate as HSR240" ↵Camera Software Integration2016-09-211-4/+10
|\ | | | | | | into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera:Force close when set video high framerate as HSR240weijiew2016-09-071-4/+10
| | | | | | | | | | | | | | | | | | Camera can't support all the video high framerate. When it's not supported, the value of framerate getting from camera device is "off".It will cause number format exception when parsing "off" to integer. Change-Id: Ie6d4840f96de4eeecad4bcf6a71ca2404ff8834a CRs-Fixed: 1063218
* | Merge "SnapdragonCamera:Fix Camera GTS failture issue." into ↵Linux Build Service Account2016-09-071-0/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera:Fix Camera GTS failture issue.junjiez2016-09-011-0/+1
| |/ | | | | | | | | | | | | | | | | | | GTS test will fail if use permission activity to return the result, so set FLAG_ACTIVITY_FORWARD_RESULT flag for the intent and let CameraActivity return the result directly. And add URI read permission to the return intent Change-Id: I224789bbd430d977234d2bcbea4e38e957b81142 CRs-Fixed: 1059964
* | Merge "SnapdragonCamera: Use resume/start based on the SDK version for cam2" ↵Linux Build Service Account2016-09-071-4/+1
|\ \ | |/ |/| | | into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Use resume/start based on the SDK version for cam2Jay Wang2016-08-181-4/+1
| | | | | | | | | | | | | | | | In camera 2 module, we make the same change to use resume/start based on the SDK verion for camcorder resuming use-case Change-Id: I2e943bf647bf48ac194096977d96601beb6174b0 CRs-Fixed: 1028570
* | Merge "SnapdragonCamera: Fix camera flash blink after unlock device" into ↵Linux Build Service Account2016-08-251-5/+16
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix camera flash blink after unlock devicemingwax2016-08-161-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RootCause: when lock the screen and unlock the screen quickly,the system could show the last recent app when the lockscreen is not ready.when the lockscreen is ready now,system could dismiss the last recent app.When camera show,run onResume method,flash could be opened.And when camera run onPause method,flash could be closed,it caused flash blink. Add delay time avoid when camera be opened and closed quickly caused flash blink Change-Id: Id32eaf5186020edd1c835315efa9a2671db9f952 CRs-Fixed: 1034366
* | | Merge "SnapdragonCamera: disable HFR when image stabilization turned on" ↵Linux Build Service Account2016-08-251-6/+5
|\ \ \ | | | | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: disable HFR when image stabilization turned onweijiew2016-08-161-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HFR/HSR recording not supported with image stabilization, timelapse,HDR option.HFR/HSR menu must be disable when image stabilization,timelapse,HDR option are turn on Change-Id: I12573e57dab274297dff82b1a9082bc7602f2933 CRs-fixed: 1046239