summaryrefslogtreecommitdiff
path: root/src/com/android/camera/VideoModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-161-1/+1
| | | | | | | | Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
* Camera2: Enhance KK cameraapp for LChiou-Hao Hsu2014-08-161-3/+3
| | | | | | Enhance KK cameraapp for L. Change-Id: If708b253f34a131d7842f8921e54c008283e0056
* Camera: Add HSR 60 and HSR 90 modesVijay kumar Tumati2014-07-161-55/+34
| | | | | | | | | | | | | Adding 2 more modes 60 and 90 to HSR feature. HSR - High speed recording where video is recorded at the same fps at which camera is pumping frames. CRs-Fixed: 629713 Change-Id: I31a13f8d5db8c94be7bafb7506bafe268b764362
* Merge "Merge tag 'android-4.4.3_r1' into HEAD"Linux Build Service Account2014-06-231-1/+12
|\
| * Merge tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-111-1/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 4.4.3 release 1 * tag 'android-4.4.3_r1': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Remove TRIM support Import translations. DO NOT MERGE Import translations. DO NOT MERGE Fix samsung video recording Fix WB indicator override Revert fixed focus area in CAF mode Add another HTC picture resolution Always set focus mode first before applying scene mode Reduce logging of flattened Preferences Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Conflicts: res/values/arrays.xml src/com/android/camera/FocusOverlayManager.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Change-Id: I4be00366e24933c6504639776c711e1a874d1f2e
| | * 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: fix flash light turn on after resume camera activitykaiyiz2014-06-171-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
* | Merge "Camera2: enable WNR in video mode"Linux Build Service Account2014-06-061-0/+7
|\ \
| * | Camera2: enable WNR in video modeLikai Ding2014-06-061-0/+7
| | | | | | | | | | | | | | | | | | | | | Enable WNR to reduce noise in 720P recording preview. Change-Id: I74471446b5fba0216b292f8fca81bf6e09b5d997 CRs-Fixed: 669247
* | | Merge "Camera2: disable the shutter button when not previewing"Linux Build Service Account2014-06-061-0/+1
|\ \ \
| * | | Camera2: disable the shutter button when not previewingLikai Ding2014-06-061-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
* | | Merge "Camera: Move out TimeLapse option from global list"Linux Build Service Account2014-06-061-0/+3
|\ \ \ | |/ / |/| |
| * | Camera: Move out TimeLapse option from global listSuman Mukherjee2014-05-291-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: Query support for longshot and ZSL+HDR from parameters.Sai Kumar Sanagavarapu2014-06-021-0/+5
|/ / | | | | | | | | | | | | | | | | | | Query camera parameters to check if longshot and ZSL+HDR are supported or not. Also, add generic way of enabling/disabling preferences to facilitate features which are mutually exclusive. Change-Id: I4332e3d5050f56b1953e4c0d767eb87f7e932c49
* | Camera: Block HFR option for Video HDRSuman Mukherjee2014-04-231-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. Change-Id: I4b0f8362667a53e46a83223cab77b7248e1410e2 CRs-Fixed: 652078
* | Merge "Camera2: enable antibanding when dis is enable"Linux Build Service Account2014-04-211-0/+18
|\ \
| * | Camera2: enable antibanding when dis is enableGaoxiang Chen2014-04-141-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
* | | Camera: Disable DIS option for unsupported resolutionSuman Mukherjee2014-04-201-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: I982e64f9f3a24c96e83484c6ce8cda3381139520 CRs-Fixed: 644268
* | | Merge "Camera: Change video capture duration with HFR"Linux Build Service Account2014-04-191-0/+15
|\ \ \
| * | | Camera: Change video capture duration with HFRSuman Mukherjee2014-04-081-0/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* / / Camera: Block DIS and Timelapse for HFRSuman Mukherjee2014-03-271-0/+21
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Change-Id: I42ed3d3d20727ddda1b15c21b3ba85c8c41a82ef CRs-Fixed: 627373, 627362
* | Camera: Open back camera first irrespective of IDVijay kumar Tumati2014-03-261-0/+31
| | | | | | | | | | | | | | | | On 8916, we see back camera probed with camera ID 1. We need to open back camera first in these cases as well. Change-Id: Ie3d71afc75ef92bbb95d748cd581252fb8294e1c
* | Merge "Camera: Add a feature to choose where to store the picture and video"Linux Build Service Account2014-03-061-1/+14
|\ \
| * | Camera: Add a feature to choose where to store the picture and videoSanthosh Kumar H E2014-02-271-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a feature to choose use SDcard or phone to store picture and video captured by camera and camcorder. Some of the changes are taken from: I987a691c93edc4250fe0366d0623c85ea0152117 CRs-Fixed: 619806 Change-Id: I009df4c70f0a1b49b20750f806c799f025bb6197
* | | Merge "Camera: Check if codec supports HFR resolution/fps."Linux Build Service Account2014-03-031-0/+24
|\ \ \ | |/ / |/| |
| * | Camera: Check if codec supports HFR resolution/fps.Sai Kumar Sanagavarapu2014-01-301-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
* | | Merge "Camera2: Added pause button in Camcorder"Linux Build Service Account2014-02-181-3/+39
|\ \ \
| * | | Camera2: Added pause button in CamcorderManikanta Kanamarlapudi2014-01-211-3/+39
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge "Camera: Disable livesnapshot for 4kx2k video"Linux Build Service Account2014-02-131-9/+4
|\ \ \
| * | | Camera: Disable livesnapshot for 4kx2k videoTanmaya Godbole2014-02-111-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: Add support for high speed recordingVijay kumar Tumati2014-02-101-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | To support 120fps recording without slow motion effect, these changes are needed. This enables 120 FPS for all resolutions if HSR is on. Change-Id: Iece5a382a80f4e3064880d26a29949705352b0e0
* | | Merge "camera: fix camera crash in hfr"Linux Build Service Account2014-02-041-8/+11
|\ \ \
| * | | camera: fix camera crash in hfrSanthosh Kumar Thimmanna Bhattar2014-02-041-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:stop recording from camcorder app in case of errorSanthosh Kumar Thimmanna Bhattar2014-01-131-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
* | Merge "Camera2 : Reset mSnapshotInProgress if recording stopped."Linux Build Service Account2014-01-111-1/+9
|\ \
| * | Camera2 : Reset mSnapshotInProgress if recording stopped.Sai Kumar Sanagavarapu2014-01-081-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
* | | Merge "Camera: Add support for 4K camcorder"Linux Build Service Account2014-01-091-3/+17
|\ \ \
| * | | Camera: Add support for 4K camcorderAzam Sadiq Pasha Kapatrala Syed2014-01-021-3/+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
* | | | Camcorder: Switch video torch when preview focusedVladimir Petrov2014-01-061-1/+6
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge "Camera2: Fix for unsupported resolutions by codec."Linux Build Service Account2013-12-291-8/+25
|\ \ \
| * | | Camera2: Fix for unsupported resolutions by codec.Sai Kumar Sanagavarapu2013-12-201-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 E2013-12-111-7/+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
* | 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
|\ \ \
| * | | Camcorder default video quality preference updated as per UI.Santhosh Kumar H E2013-11-251-4/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Video quality preference was not initialized to the default value. But it was read as null and set to maximum available quality. So the actual value set to camera is different from the one user see in the settings list. This change will set the default quality to the preference if its supported. Change-Id: Ie219e0965a6ac06e62f32cc6c52fdf255a07adee CRs-Fixed: 565374
* | | Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-0/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
| * Show a preview cover until real preview is readyDoris Liu2013-10-151-0/+1
| | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-14 02:45:37 +0000