summaryrefslogtreecommitdiff
path: root/src/com/android/camera/VideoModule.java
Commit message (Collapse)AuthorAgeFilesLines
* Revert "camera: add support for samsung and htc camcorder modes"HEADkitkatMichael Bestas2014-10-291-3/+0
| | | | | | | | * This is moved to the device specific camera wrappers This reverts commit e43890784fd08ac92de08691c7c6ba545c7ecb80. Change-Id: I74ac0654ccf1e04cbb69e2fa8a2a651990b484a9
* Camera2: Remove CAF video duration codeMichael Bestas2014-10-291-20/+1
| | | | Change-Id: I583e212f3c43a5ddf80fdb16557b3ddd9e3161c2
* Camera2: enable WNR in video modeLikai Ding2014-10-291-0/+6
| | | | | | | Enable WNR to reduce noise in 720P recording preview. Change-Id: I74471446b5fba0216b292f8fca81bf6e09b5d997 CRs-Fixed: 669247
* Camera2: enable antibanding when dis is enableGaoxiang Chen2014-10-291-0/+18
| | | | | | | | banding will seriously impact DIS algorithm, so we need to set anti-banding to auto when DIS is enabled. Change-Id: I5ce9e907c68be803b35a929659fc1a9e0ac78642 CRs-fixed: 619074
* Camera2: disable the shutter button when not previewingLikai Ding2014-10-211-0/+1
| | | | | | | | | Camera app will crash if the shutter button is clicked while not previewing. Disable the shutter button in onStopPreview() as it's called by onSurfaceTextureDestroyed(). Change-Id: Ied369610c590323b977b4ac1c3150c6c905e9466 CRs-Fixed: 669190
* Camera2: fix flash light turn on after resume camera activitykaiyiz2014-10-211-1/+1
| | | | | | | | | | | | | | If user choose an app to open video, onResume will be called after the choose dialog is dismiss. The function opencamera will be called and the value mPreviewFocused will be set true, which lead to flash light turn on when setCameraParameters. The value mPreviewFocused won't be true if not in Camera Preview, we can use the visible of mCameraControls to judge. CRs-Fixed: 680450 Change-Id: Ia04ae0fb77f05fb991e5262f86cbe6f308db7709
* Camera2: Add option to set max screen brightnessMichael Bestas2014-10-211-1/+5
| | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
* Camera: Block HFR option for Video HDRSuman Mukherjee2014-10-211-3/+6
| | | | | | | | | | | | | | Video HDR can’t work with HFR and that caused AEC behaviour change. Fix Made: User'll be notified that HFR/HSR selection is not allowed for HDR mode. After that, HFR selection will be set to off and the option will be disabled. It'll not be vice versa as HDR has higher priority than HFR. [mikeioannina]: Removed HSR code Change-Id: I4b0f8362667a53e46a83223cab77b7248e1410e2 CRs-Fixed: 652078
* Camera: Disable DIS option for unsupported resolutionSuman Mukherjee2014-10-211-2/+14
| | | | | | | | | | | | DIS will not work for unsupported resolution. If user'll start recording with DIS alongwith 720p resolution using front camera, then it'll crash. Fix: Block in UI, so that user'll not be able to select DIS with unsupported resolution after intimating through toasts. Change-Id: Ie788d456a7b15061f16a44ca34ccd3d1e6d90071 CRs-Fixed: 644268
* Camera: Block DIS and Timelapse for HFRSuman Mukherjee2014-10-211-0/+18
| | | | | | | | | | | | | | | | | DIS and Timelapse is not supported for HFR scenario. If user'll start recording with timelapse or DIS with HFR then crash observed from lower layer. Fix Made: User'll be notified that HFR/HSR selection is not allowed for TimeLapse and/ DIS mode. After that, HFR selection will be set to off and the option will be disabled. It'll not be vice versa as DIS/TimeLapse has higher priority than HFR for their existance in primary popup rather than being in secondary. [mikeioannina]: removed HSR code Change-Id: I42ed3d3d20727ddda1b15c21b3ba85c8c41a82ef CRs-Fixed: 627373, 627362
* Camera: Check if codec supports HFR resolution/fps.Sai Kumar Sanagavarapu2014-10-211-0/+24
| | | | | | | | Some codecs can have limitation on the max HFR fps and video size combination. So, query the video encoder capabilites first and report error if codec doesnt support the combination. Change-Id: Ic2032176067a6f92d1363471d1a767d5ef589591
* Camera: Change video capture duration with HFRSuman Mukherjee2014-10-211-0/+14
| | | | | | | | | | | | | | | While capturing a video with HFR, duration is getting stored properly in metadata but not in media database. While checking details, duration is showing actual captured duration, not the playback duration. After rebooting the phone, then media table is getting updated with proper duration. Fix made: After capture, change duration value as per user selected HFR option. CRs-Fixed: 627354 Change-Id: Ifb7c607e3545c4d2a2e0b1b7666cb0567640d416
* Camera2: Fix video duration is wrong issueliangche2014-10-211-1/+6
| | | | | | | | When mMediaRecorderPausing is true, video duration is equal to mRecordingTotalTime, which can fix video duration is wrong issue if use pause/resume. Change-Id: I71d41414bba11564cfe84166fbc18608636a73d1
* Camera2: Do not restart preview to update flip params during orientation change.kaiyiz2014-10-211-44/+52
| | | | | | | | | | | | | When there was a orientation change flip paramter had to be changed. Currently all parameters are set again and preview is being restarted. so preview will not be smooth when user rotae the device. This change makes sure only necessary params are updated and preview will not be restarted. CRs-Fixed: 710129 Change-Id: I564431ef8cedaf68c9d12e2a84a3a430c845ab6d
* Camera2: Headset shutter modeDave Daynard2014-10-031-0/+6
| | | | | | | Use play button on headset to take a picture/video/panorama Use media next/previous for zoom Change-Id: I25c22646b041e5e0941fbe361eccfe77a2a1e42f
* Camera: Move out TimeLapse option from global listSuman Mukherjee2014-09-111-0/+3
| | | | | | | | | | | TimeLapse setting was common for front and back camera As there is no specific reason to have it common, to align with other settings, moved it out from common list so that Timelapse setting change in front camrea will not affect for back camera and vice versa. CRs-Fixed: 654627 Change-Id: I0b14284adc6063ccb9bf175a37644c162bb47fd5
* Camera2: Prevent propogating CancelAutoFocus during Video RecordingDheeraj CVR2014-09-111-1/+0
| | | | | | | | | | 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
* Merge tag 'android-4.4.3_r1.1'Dirk Rettschlag2014-06-061-1/+13
|\ | | | | | | | | | | Android 4.4.3 release 1.1 Change-Id: Icc767484426dcecfd8b121756474c6f72f3bc7fa
| * Fix samsung video recordingMichael Kolb2013-12-031-1/+11
| | | | | | | | | | | | | | | | | | | | | | Patching Bryce CL into Carlsbad Bug: 9056573 Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9 Conflicts: src/com/android/camera/VideoModule.java
* | Camera2: Prevent autofocus when video snapshot is in progressDheeraj CVR2014-05-051-1/+1
| | | | | | | | | | | | | | | | | | 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
* | Camera2: Surface Qualcomm HFR settingEthan Chen2014-04-071-7/+8
| | | | | | | | | | | | * Also fix HFR variable naming Change-Id: Ibcf43da1d7e2ae0f22f13718f16c3e3fe8debad8
* | Camera: Disable livesnapshot for 4kx2k videoTanmaya Godbole2014-02-261-9/+4
| | | | | | | | | | | | | | | | | | 1) Since livesnapshot is not supported for 4kx2k video size, disable it from the UI. 2) Revert parts of commit 2c309499e60120ec513f51bfab02e7d54237af0a to get 4kx2k video recording working. Change-Id: I837f242d505d2c2f07aeb33d81c2560f5b645a39
* | camera: fix camera crash in hfrSanthosh Kumar Thimmanna Bhattar2014-02-261-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | - When the maximum supported sizes of 60/90/120 are different, camera will crash when set hfr size to the maximum supported size while the current hfr mode doesn't support. - Fix is to use the supported maximum size of the HFR only when the specified maximum size is not supported by the current HFR mode. ( cherrypicked from commit 494783c6dc29e76adbc7a714062c6739b785ee23 ) Change-Id: Ia74949e5f97d02b22ad817ac7068b5a676004f3a CRs-Fixed: 527339
* | Camera2: Added pause button in CamcorderManikanta Kanamarlapudi2014-02-261-3/+41
| | | | | | | | | | | | | | | | | | - Added pause button in camcorder app.so that user pause recording and resume later which results in a single recorded clip. CRs-Fixed: 587051 Change-Id: I2a7d8af7fcea74fe8af62c44119c3c1fa0c13e85
* | Camera2:stop recording from camcorder app in case of errorSanthosh Kumar Thimmanna Bhattar2014-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | This change makes sure that stopvideoRecording is called for all error returns to the video recording app. ( cherrypicked from commit 9d65272083d0a78ca4adefbffc38f98b44cfa489 ) Change-Id: I88c4ac92f065e5008c16a7697a84301e1ff5e98f CRs-Fixed: 517351
* | Camera2 : Reset mSnapshotInProgress if recording stopped.Sai Kumar Sanagavarapu2014-02-261-1/+9
| | | | | | | | | | | | | | | | | | | | If recording stops while snapshot is in progress, we might not get jpeg callback because cameraservice will disable picture related messages. Hence reset mSnapshotInProgress flag so that we can take liveshots in the next recording session. Change-Id: I6a639eb0b9444e4915786c65f64d3b95b064267c CRs-Fixed: 588698
* | Camcorder: Switch video torch when preview focusedVladimir Petrov2014-02-261-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Currently, video torch switching is not determined properly. When user enables and disables flash mode checkbox, nothing happens. Also, if video torch is enabled and switching to Camera and back to Camcorder mode, torch doesn't lights up. - Adding a local variable mPreviewFocused to track the preview window focus state should fix the issue. Change-Id: Ia134b86885eda1ad50d510e67e5595a391326d10 CRs-fixed: 567295
* | Camera: Add support for 4K camcorderAzam Sadiq Pasha Kapatrala Syed2014-02-261-2/+17
| | | | | | | | | | | | | | | | In case 4k is enabled, (a) set the preview resoultion same as video resolution. (b) set the preview format same as video format. Change-Id: Iebc4c7d47ddca6e03a72f3af7b4660e93c9a1b8e
* | camera: add support for samsung and htc camcorder modescodeworkx2014-02-251-0/+3
| | | | | | | | Change-Id: I68e6995a51dffa3b5851eb4b7a3a72e60d201d5b
* | Camera: Cleanup hardware key handlingMichael Bestas2014-02-021-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 Bestas2014-02-021-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 PS2: Make Camera2 a privileged app PS5: Sign with platform certificate instead of making it a privileged app. PS6: Add write permission to PREVENT_POWER_KEY PS7: Move PREVENT_POWER_KEY permission to CameraActivity PS8: Revert to PS5 Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I0992baa558eefd306d00fbece59cb5c512d9448b
* | Merge "Storage configuration options (1/2)" into cm-11.0Ricardo Cerqueira2014-01-271-1/+10
|\ \
| * | Storage configuration options (1/2)Scott Warner2014-01-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the user to change the default storage path from the standard internal storage to any available external storage. When the path is changed, it sends an intent to the gallery application to keep the paths in sync (Requires part 2 in Gallery2) Change-Id: I1dbd1161230ad1d48440c6c3a29841c5c486a905
* | | Camera2: implement volume key zoom in video modejt11342014-01-261-0/+9
| | | | | | | | | | | | Change-Id: I140e8cfb3e39700f60e40c35b38e92c83a3c26de
* | | Camera: separate settings for color effectsjt11342014-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | 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 modejt11342014-01-261-0/+22
| | | | | | | | | | | | Change-Id: I83a2675e109dc7924cdd9240b26051ac218f532a
* | | camera: Bring back ignorePreferredPreviewSizeForVideoSteve Kondik2014-01-201-0/+4
|/ / | | | | | | | | | | | | * Still needed on some old but capable devices that report a tiny preferred preview size Change-Id: Ib78e0683cbf29644fc6f21200b55ee2efa90bbae
* | Camera2: Fix for unsupported resolutions by codec.Sai Kumar Sanagavarapu2014-01-021-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, logic for unsupported resolution for a codec is hardcoded and is limited to only H263 and 1280x720 resolution. Ideally, we should read capabilities of each codec from mediaprofiles.xml and check it against selected profile. Toast message is posted if any unsupported resolution is selected. Also skip setparameter call to HAL during recording, when orientation gets changed. Change-Id: Ife7dde725882d8217fadff7b56687cdad2c72ae4
* | Set original camera parameters while switching between modules.Santhosh Kumar H E2014-01-021-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera holder maintains a local variable to get original params and set those params back when user switch between modules. But these parameters were obtained from the instance of camera manager. So object in Camera holder will be a reference to an object in camera manager. Becasue of this all the parameters set in photo module are getting reflected in other modules. This change makes sure the camera holder's parameters object is created separately by getting data from camera device. Also reverted the alternative solution to reset scene mode in video and panorama module. CRs-Fixed: 579747 Change-Id: I02637fb2c215aeb1ba9076629400a339c31178ad
* | Camera2: fix FC when switching camera in video modePawit Pornkitprasan2013-12-291-5/+6
| | | | | | | | | | | | | | | | mFocusManager's manager needs to be updated before startPreview, otherwise setParameters will be called with an invalid preview mode resulting in a crash on some device (in this case, aries). Change-Id: I32c113e744f95b4939c070b3aad8b4b5c53fce65
* | Revert "Camera: Propagate power mode selection from UI to lower layers."Ricardo Cerqueira2013-12-221-13/+1
| | | | | | | | | | This reverts commit 5302d2e099de0ae1c3cb4a9cda993fe28b0e8c46, runtime power-mode changes are causing stability issues in camcorder
* | camera: Touch focus support for camcorderSteve Kondik2013-12-211-9/+143
| | | | | | | | | | | | | | * Available when video snapshots are not supported. * Original from CodeAurora Forum. Change-Id: I232c178430db08e7366aa9f91b4926d07e7c225d
* | camera: Forward-porting CM featuresSteve Kondik2013-12-161-1/+7
| | | | | | | | | | | | | | | | | | * ASD, slow shutter, beautify, focus time, etc * New menu structure * Includes work from Steve Kondik, Ethan Chen, jt1134, Michael Bestas Change-Id: I73cf1e685ab2d55579d4b85f39916b59435e6569
* | camera: Cleanup and compatibility fixesSteve Kondik2013-12-141-2/+4
| | | | | | | | | | | | | | * Don't crash for unavailable integer parameters * Kill logspam Change-Id: I6dbcf5560f96ce6173a847501721f589766889bc
* | camera: Add parameter debugging supportSteve Kondik2013-12-141-0/+4
| | | | | | | | Change-Id: Ifc1653f0046af169ba36d94796b4d9a3055c6798
* | Merge "Do not add screen hint dialog when window is not available."Linux Build Service Account2013-12-071-0/+6
|\ \
| * | Do not add screen hint dialog when window is not available.Santhosh Kumar H E2013-11-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SD card screen hint is directly added to activity window. In the error case its trying to add the screen hint dialog even before the activity window is available. This change check for the availability through window focus. In photo module update hint is called through handler to make sure it adds the dialog in UI thread, which was missing in panorama modo. This change as photomodule kind of UI updation calls in Panorama mode. Change-Id: I5cad2e86a23aceff290ef8d4ef89dbfdaaeb683d CRs-Fixed: 573549
* | | Merge "Camera: Check file existence before update"Linux Build Service Account2013-12-071-0/+8
|\ \ \
| * | | Camera: Check file existence before updateAshok Raj Deenadayalan2013-11-281-0/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Recorded file must exist for updation. Check if the file exists before you update to avoid crash. Treat file non-existence as a error case and proceed further. Change-Id: I31954d51f0c34ef3d0ee25cb30d243804bc93fc3 CRs-Fixed: 573040
* | | Merge "Camcorder default video quality preference updated as per UI."Linux Build Service Account2013-12-071-4/+11
|\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 17:58:25 +0000