summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Using reflection to remove compilation error" into ↵Linux Build Service Account2016-06-101-1/+7
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Using reflection to remove compilation errorSanjeev Garg2016-06-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: Currently the camera app is being used across multiple PLs, which are on different android versions (Android M, N). There are different variables being used for h256 across different android framework - M and N. Hence using one variable name is causing compilation error in other android version Fix: Using java reflection to access variables to avoid any compilation dependency on different android versions CRs-Fixed: 1015477 Change-Id: I68519223dbe9825e8b1a7f5d1a8e509713a743c6
* | Revert "SnapdragonCamera: Use mediarecorder resume instead of start"Camera Software Integration2016-06-081-1/+1
| | | | | | | | | | | | This reverts commit ebf9dcc648cb5faade3a59d155f696e7927923d0 Change-Id: I335aea386ee457063ccd04f3f15095e3f5a3f797
* | Merge "SnapdragonCamera: Use mediarecorder resume instead of start" into ↵Camera Software Integration2016-06-071-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Use mediarecorder resume instead of startSanthosh Behara2016-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | For camcorder to resume after pause use mediarecorder's resume() API instead of start() API Change-Id: Ieb6e2c681ed5403b26bfc522c7dfef41104e3653
* | | Merge "SnapdragonCamera: Add SettingsManager, scene, and filter" into ↵Camera Software Integration2016-06-071-4/+2
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Add SettingsManager, scene, and filterByunghun Jeon2016-05-311-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "SnapdragonCamera: Set outputFormat type as 3gp for AMR audio" into ↵Camera Software Integration2016-06-071-0/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Set outputFormat type as 3gp for AMR audioSanthosh Behara2016-05-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When audio encoder type is of AMR then the outputFormatType should be of 3gp instead of mp4 CRs-Fixed: 1021675 Change-Id: I60645c091ea026bd50f56407c0afbc2638d529f1
* | | | Revert "Revert "Revert "SnapdragonCamera: Update encoder from H265 to HEVC"""Camera Software Integration2016-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dba00aac4e44a91bc55b0aabca9f191d03994edf Change-Id: I9a34c8640f26f16b6b30e36af7a3ab7a5c4e1b03
* | | | Revert "Revert "SnapdragonCamera: Update encoder from H265 to HEVC""Camera Software Integration2016-05-311-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Resinstating Change-Id: Ib17de6f778166f3a7cb7b8e403a9b3c7fb0b3f0c CRs-fixed: 1015477 This reverts commit e8d4ba774d224e5076576ba4c29d1fc248456b40 Change-Id: I9dd2dc05068e73edd9bad617480cff5c77015b58
* | | Revert "SnapdragonCamera: Update encoder from H265 to HEVC"Camera Software Integration2016-05-311-1/+1
|/ / | | | | | | | | | | This reverts commit 08f68a1e4d05ae996f6bf42c83d692a182a8f34b Change-Id: I659dd68861b30b6d79545ba3574320b63e4c4196
* | Merge "SnapdragonCamera: Update encoder from H265 to HEVC" into ↵Linux Build Service Account2016-05-231-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Update encoder from H265 to HEVCSusmitha Gummalla2016-05-131-1/+1
| |/ | | | | | | | | | | | | | | Update Camera setting to use HEVC instead of H265 as per latest AOSP changes CRs-fixed: 1015477 Change-Id: Ib17de6f778166f3a7cb7b8e403a9b3c7fb0b3f0c
* / SnapdragonCamera: Release audio focus when video recording is doneJay Wang2016-05-061-1/+13
|/ | | | | | | | When video capturing is finished, release the audio focus so music application can resume the playback. Change-Id: I5c425b7717e9a31ec9c839ed2689d9b1da852428 CRs-Fixed: 1012070
* Merge "SnapdragonCamera: request audio focus before starting video ↵Linux Build Service Account2016-05-031-7/+11
|\ | | | | | | recording" into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: request audio focus before starting video recordingJay Wang2016-04-221-7/+11
| | | | | | | | | | | | | | | | Use audio focus API to stop other music streams when starting video recording. Change-Id: I0097d0c2bd7157bc1936b9120bbe7c917b9707ee CRs-Fixed: 1005855
* | SnapdragonCamera: Temp fix to make both M and N compileLida Wang2016-04-301-1/+1
|/ | | | | | Temp fix to make app compile on both Android M and N CRs-fixed: 1007835 Change-Id: Ia3abac6d157b8e52d0998733e0a2dfbe194e0e94
* Merge "SnapdragonCamera: Fix the issue that IS is not disabled" into ↵Linux Build Service Account2016-04-171-1/+2
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Fix the issue that IS is not disabledJay Wang2016-04-071-1/+2
| | | | | | | | | | | | | | | | | | | | IS needs to be disabled when 4K video is captured. However, 4K video checking logic doesn't include the time lapse 4K profile and reports the incorrect state. This causes the video module fails to disable the IS. Change-Id: I15bfb2e9e6022e367a68819a436e3296d085d33b CRs-Fixed: 997368
* | Merge "SnapdragonCamera: Adjusting view initialization" into ↵Linux Build Service Account2016-04-171-0/+5
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Adjusting view initializationJack Yoo2016-04-061-0/+5
| |/ | | | | | | | | | | | | | | Instead of removing and adding the entire root view, changing only core surface view on module change. Change-Id: I5c39cf23b2a58280f4e4e8484865bbed0b12e1cf CRs-Fixed: 979254
* / SnapdragonCamera: handle IllegalArgumentException while saving videoJay Wang2016-04-121-3/+4
|/ | | | | | | | | Handles the IllegalArgumentException caused by setDataSource() while saving video. This exception indicates that the file path is invalid. CRs-Fixed: 993646 Change-Id: I0cbd496793246bfbbeac556203c0d43f122b4942
* SnapdragonCamera: Fix missing icon issue in error conditionJay Wang2016-03-181-0/+1
| | | | | | | | When onError is called from media recorder, re-draw the video control icons after stopping the recording session. Change-Id: If7a38ff4c12ec90018fe0d1a89d08fd94bf89f6f CRs-Fixed: 982804
* SnapdragonCamera: Reset menu when device is rotatedByunghun Jeon2016-03-181-0/+1
| | | | | | | Reset the settings menu when the device is rotated Change-Id: I6c4fed7207a4d26a9d7c29d18f6a7af17ef3d4f9 CRs-Fixed: 981504
* SnapdragonCamera: Fix timing of preference initializationByunghun Jeon2016-03-171-5/+8
| | | | | | | Initialize preference before making the views visible. Change-Id: Ie3d541c7fcb29ed86e0e9fd52a1a1e4ea870f009 CRs-Fixed: 982842
* SnapdragonCamera: Improve camcorder switch latency.Sai Kumar Sanagavarapu2016-03-111-1/+16
| | | | | | | | Avoid redundant start/stop preview calls during camera to camcorder switch, by checking current preview state. CRs-Fixed: 984765 Change-Id: I7bfc46c51310c4a5cf99935da5f9b3a0b148bdf7
* SnapdragonCamera: Add face detection icon to videoJay Wang2016-03-021-0/+52
| | | | | | | Add video face detection to developer option CRs-Fixed: 978207 Change-Id: I9308573a5a1004fc3803a955bc96f495ecbfc6c7
* SnapdragonCamera: Disable NR when SeeMore is enabledJay Wang2016-02-191-9/+21
| | | | | | | | - Add condition to disable NR when SeeMore is enabled - Clean up the SeeMore conditional checking logic Change-Id: I191794c034e0c70818cee785516575d5642497ca CRs-Fixed: 972044
* SnapdragonCamera: Fix flickering Video previewByunghun Jeon2016-02-191-1/+2
| | | | | | | Fix flickering Video preview when pause/resuming Change-Id: I7e20cfdc06fc940f4fc96f408ce6ab570b0d8e64 CRs-Fixed: 971394
* SnapdragonCamera: Fix blank preview issue during pause & resumeJay Wang2016-02-031-1/+3
| | | | | | | | | | | | | | | Continuous pause & resume operation by pressing the power button can cause the blank preview. The application close the camera when there is onPause or screen off intent. Sometimes the resume comes after screen off intent when user resumes the device quickly after pausing the device. Because of this race-condition, the camera is closed unintentionally. To resolve the issue, re-structure the code to receive screen-off intent only during video recording and stop the recording when intent is received. Change-Id: Ic993b83527b41dbbf53f63ef8ca25fa3a12fb77e CRs-Fixed: 970172
* SnapdragonCamera: Fix the memory leak on view.Jack Yoo2016-01-301-1/+7
| | | | | | | | Keep using modules instead of creating. Don't remove the view without cleaning it. Change-Id: I260a660cac3d770f7d02dfdc1881e15490da66a0 CRs-Fixed: 958510
* SnapdragonCamera: Register media status listenerJack Yoo2016-01-301-3/+5
| | | | | | | Register sd card media status listener on resume. Change-Id: I7b3b7e3104b7729c83d83926bb794e0d7ec237d2 CRs-Fixed: 960865
* SnapdragonCamera: Adding toast for media recording failure.Jack Yoo2016-01-201-1/+1
| | | | | | | | Adding toast message to be shown to the user when media recording is failed due to permission issue. Change-Id: I5392b41b97c73ade8df7b5d70647361306c4f695 CRs-Fixed: 944657
* SnapdragonCamera: Introducing mute buttonCamera Software Integration2015-12-221-0/+28
| | | | | | | Introducing audio mute button on video recording Change-Id: I69ff6fe97c4b8d76a890b5e41667dab534d69ba8 CRs-Fixed: 937239
* SnapdragonCamera: Moving Image Stabilization option to the menuCamera Software Integration2015-12-221-1/+2
| | | | | | | Moving Image Stabilization option to the menu Change-Id: I7fb025a3d1909af436e7a52ee9d602b2ce2dc68b CRs-Fixed: 937237
* SnapdragonCamera: fix screen flash on resuming for videoCamera Software Integration2015-12-221-1/+7
| | | | | | | | | | Currently preview cover will be hidden shortly after preview started, but if the actual first frame comes late, the main screen will flash. Register a oneshot preview callback to hide preview cover. Register the callback before calling startPreview. Change-Id: Ide0dd4b2eebe7cb73a2192f11c4ea3a471718c05 CRs-Fixed: 911138
* SnapdragonCamera: Handle cam switch icon if numOfCams less than 2Sanjeev Garg2015-11-181-4/+8
| | | | | | | | | While generalizing SnapdragonCamera app for any number of cameras we have to handle a special case if number of camera's are less than 2. If there is only 1 camera in the app then there is no camera switch option and hence the corresponding switch icon object is null Change-Id: I672708bb98a30054adaf916bb272b50cdd8d0091
* SnapdragonCamera: add video snapshot size optionByunghun Jeon2015-10-291-7/+20
| | | | | | | | Add developer option to choose video snapshot size. The "Auto" option will revert back to old behavior of choosing the largest size with the same aspect ratio as the preview. Change-Id: Ice68aef1963c1199d30e1edde4cccf7203f8fbbf
* Revert "SnapdragonCamera: fix screen flash on resuming"Byunghun Jeon2015-10-291-7/+1
| | | | | | This reverts commit 1ab897565fa4d7543af44d263d7039a32cce2666. Change-Id: Id5c0d5e7015ed656bb9f2190b1d9e408379392a5
* Revert "SnapdragonCamera: Use floating components during video record."Byunghun Jeon2015-10-291-5/+0
| | | | | | This reverts commit 59b05fd1d75943f037aec41def16cdceb6443ecf. Change-Id: I807bdbf0fe669a989d58484ab11451c891acaf5b
* SnapdragonCamera: Fix QUALITY_4KDCI variable name for M upgradeByunghun Jeon2015-10-291-1/+1
| | | | | | Fix QUALITY_4KDCI variable name to be proper for M upgrade Change-Id: Iab3c884b784bdd8652a2755fee4f70fbea7fa7ed
* SnapdragonCamera: Enable audio for HSR and fix video encoder bitratePraveen Chavan2015-10-291-10/+24
| | | | | | | | | Enable audio for HSR (stays disabled for HFR). Scale the video-bitrate based on what the profile says and the target-framerate being set on the encoder. Change-Id: I93206bf56409ab053bfbde463f8deb8c84f7c844 CRs-Fixed: 899460
* SnapdragonCamera: Enable camcorder pauseJaimin Bhise2015-10-291-1/+1
| | | | | | | Enable camcorder pause, as MediaRecorder support has been added. Change-Id: I0b710145134a2bccf52c5e76525ff187d83905e5
* SnapdragonCamera: re-enable H265 encodingPraveen Chavan2015-10-291-2/+1
| | | | | | Enable H265 video format Change-Id: Id307c98ad9cf09b71194dc38f2fbdfd11328a241
* SnapdragonCamera: Query encoder capabilities for unsupported profiles.Sai Kumar Sanagavarapu2015-10-291-74/+68
| | | | | | | Query encoder capabilities like max fps, width, height ,etc and based on this result enable/disable certain profiles/hfr modes. Change-Id: Ib5adf74eaa8d50f9ed8337a88932527624727cd4
* SnapdragonCamera: Add support for high-speed video recordingSurajit Podder2015-10-291-13/+69
| | | | | | | | | | | | | | | | | | | | | | [1] Use combination of MediaRecorder.setCaptureRate and setVideoFrameRate API to achieve HFR/HSR ------------------------------------------------------------ CaptureRate videoFrameRate Recorded-video ------------------------------------------------------------ 120 30 slow-mo @30fps 120 120 high-speed-video @120fps ------------------------------------------------------------ Deprecate usage of custom fields added to media-profiles for checking max-capabilities. Instead, introduce high-speed profiles and advertize correct values (ersolution, fps) to indicate target capabilities TODO: check against high-speed profile to check if a given {resolution, fps} is supported Add conversion routines in CameraSettings to convert from normal quality level to time-lapse/high-speed quality. Also, add back 4KDCI and VGA support Change-Id: Ic1d5ed8ef52348cab2383abe304056e0401f7069
* SnapdragonCamera: Fix compilationJaimin Bhise2015-10-291-5/+10
| | | | | | | | | | | | 1. Address compilation due to compiler upgrade. 2. Comment out video dependencies to enable camera. 3. Fix compilation issue due to IMountService interface change. 4. Comment out ExtendedFace. 5. Remove non-standard video resolutions. 6. Revert "camera: override shutter sound volume" commit 8a50cda8f72738e943904fdf7cae189b2b0a8ea8. Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
* VideoModule: Removing tmpPath and use pathJack Yoo2015-10-211-2/+1
| | | | | | | Not necessary to have tmpPath as it won't be accessed together Change-Id: I0a97e2b114bf7a554b21c4ccb20d620a01a3c579 CRs-Fixed: 877959
* Merge "SnapdragonCamera: limit video file size on SD card"Linux Build Service Account2015-10-181-0/+6
|\