summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoModule.java
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge "SnapdragonCamera:Add intent interface for APT automation" into ↵Linux Build Service Account2016-08-251-0/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:Add intent interface for APT automationjunjiez2016-08-161-0/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | Add intent interface to allow APT changing the UI settings by adb command. Change-Id: I28276ed398a09dceca6c5e59c755339fb229d1fd CRs-Fixed: 1043197
* / | SnapdragonCamera: Fix crash when switching between camera1, camera2Byunghun Jeon2016-08-161-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Camera1 uses CameraHolder for opening/releasing camera and it does not release right away when closing camera. This is done to optimize opening/closing but since Camera2 does not use CameraHolder, state is not proper when switching between camera1 and camera2. So ignore the timer and release right away when going from camera1 to camera2. Change-Id: Ibc40297817ebfca04e19097bd463f78aec4d75cd CRs-Fixed: 1019338
* | Merge "SnapdragonCamera: Force removing preview cover for camcorder" into ↵Linux Build Service Account2016-08-081-1/+5
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Force removing preview cover for camcorderJay Wang2016-07-281-1/+5
| |/ | | | | | | | | | | | | | | A workaround to remove preview cover when starting recording, if preview cover is not removed right after preview started. Change-Id: I0870ddeec9d3f40a1459315e91e5230155be9f13 CRs-Fixed: 1016691
* / SnapdragonCamera: Add system property to set EIS supported rateJay Wang2016-07-261-1/+10
|/ | | | | | | | By default, EIS is enabled with FPS <= 30. The maximum FPS can be changed by setting persist.camcorder.eis.maxfps Change-Id: I46ee1eee8121de0b5e5b1125b45d3a5f1a036461 CRs-Fixed: 1043548
* Merge "SnapdragonCamera: Remove custom location permission request window" ↵Linux Build Service Account2016-07-251-1/+26
|\ | | | | | | into camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Remove custom location permission request windowJay Wang2016-07-191-1/+26
| | | | | | | | | | | | | | | | When user enables the GPS locaion setting, use Android's run-time permission request interface to get the permission. Change-Id: Ib17171aeff5ccf20e2b00da08243dee1a3383611 CRs-Fixed: 1038039
* | Merge "SnapdragonCamera: Add a persist setting to remvoe 4K limitation" into ↵Linux Build Service Account2016-07-251-2/+6
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Add a persist setting to remvoe 4K limitationJay Wang2016-07-201-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | When persist.camcorder.4k.nolimit is set to true, application allows the user to enable EIS and SeeMore at 4K resolution Change-Id: Ia838f78aa0d7dbdc981bf61b4640e2504d9ab75d CRs-Fixed: 1043548
* | | Merge "SnapdragonCamera: Remove HFR restriction based on encoder type" into ↵Linux Build Service Account2016-07-251-3/+0
|\ \ \ | |/ / |/| | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Remove HFR restriction based on encoder typeJay Wang2016-07-131-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is a logic already checking the encoder capabilities and decides if the HFR can be supported or not. Therefore, we can remove the HFR restriction based on encoder type. Change-Id: I98626dd8ff7192c437db03f77d4707accde37b8b CRs-Fixed: 1041269
* | | Merge "SnapdragonCamera: Use resume/start based on the SDK version" into ↵Camera Software Integration2016-07-191-1/+14
|\ \ \ | |_|/ |/| | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Use resume/start based on the SDK versionUma Mehta2016-07-061-1/+14
| |/ | | | | | | | | | | | | | | For camcorder to resume after pause use mediarecorder's resume() API in N and later versions and for the rest of older versions call start() API Change-Id: I01e761215c31e03c87b98149f13cd5c3f2482d05
* / SnapdragonCamera: Resolve integer overflow issueJay Wang2016-07-051-1/+1
|/ | | | | | | | | The video bit rate calculation can cause integer overflow due to multiplying two huge numbers. To resolve the issue, do the division before the multiplication. Change-Id: I8b077fd68ed3e4f22cc5a2f9cb2a1490d0ed3376 CRs-Fixed: 1030274
* SnapdragonCamera: Fix the camera setting corruption issueJay Wang2016-06-211-2/+10
| | | | | | | | | | | | Two instances of camera preference were created and caused the wrong preference instance is referenced when changing the camera2 mode. Due to this, it corrupted the camera setting on the other camera device. To resolve the issue, create single instance of camera preference and re-use it. Change-Id: Ia1a6923a10b83e4c5777fb1318677c1f191942fb CRs-fixed: 1025776
* 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