summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Add ISO and exposure" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-06-075-8/+112
|\
| * SnapdragonCamera: Add ISO and exposureByunghun Jeon2016-05-315-8/+112
| | | | | | | | | | | | | | Add ISO and exposure to CaptureModule Change-Id: If6f3c142bcfbbcc049c10d7be2fe5a4c86d31fe6 CRs-Fixed: 1018118
* | Merge "SnapdragonCamera: Add SettingsManager, scene, and filter" into ↵Camera Software Integration2016-06-0728-1597/+2841
|\| | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Add SettingsManager, scene, and filterByunghun Jeon2016-05-3128-1597/+2841
| | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "SnapdragonCamera: adjust video recording duration margins" into ↵Camera Software Integration2016-06-072-3/+3
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: adjust video recording duration marginsJay Wang2016-05-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Video recording duration overlays with mute button for low resolution display. Resolve the issue but adjusting the margins Change-Id: I526529dd71190f65b2b97c1bd79844129e2773f9 CRs-Fixed: 1019589
* | | | Merge "SnapdragonCamera: disable instant capture in some cases." into ↵Camera Software Integration2016-06-075-31/+51
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: disable instant capture in some cases.Jay Wang2016-05-265-31/+51
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Disable instant capture when ZSL is off or advanced features are enabled 2. Change the instant capture option to support the selection of aggressive AEC and fast AEC CRs-Fixed: 998509 Change-Id: I60f7ed3a0fc93627dbf7527fbec2a60605aad683
* | | | Revert "Revert "Revert "SnapdragonCamera: Update encoder from H265 to HEVC"""Camera Software Integration2016-06-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dba00aac4e44a91bc55b0aabca9f191d03994edf Change-Id: I9a34c8640f26f16b6b30e36af7a3ab7a5c4e1b03
* | | | Revert "Revert "SnapdragonCamera: Update encoder from H265 to HEVC""Camera Software Integration2016-05-312-2/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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-312-2/+2
| | | | | | | | | | | | | | | | | | This reverts commit 08f68a1e4d05ae996f6bf42c83d692a182a8f34b Change-Id: I659dd68861b30b6d79545ba3574320b63e4c4196
* | | SnapdragonCamera: Enable jpeg encoding via reprocessJay Wang2016-05-244-211/+387
| |/ |/| | | | | | | | | | | | | | | | | Enable JPEG encoding via reprocess request for ClearSight routine. Add support for dumping images in NV21 format using persist.camera.cs.dumpyuv CRs-Fixed: 993611 Change-Id: I51ff59ec45bb37059a16197186a9f90bc52554f1
* | Merge "SnapdragonCamera: Update encoder from H265 to HEVC" into ↵Linux Build Service Account2016-05-232-2/+2
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Update encoder from H265 to HEVCSusmitha Gummalla2016-05-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Update Camera setting to use HEVC instead of H265 as per latest AOSP changes CRs-fixed: 1015477 Change-Id: Ib17de6f778166f3a7cb7b8e403a9b3c7fb0b3f0c
* | | SnapdragonCamera: Ensure only UI thread accesses Ui elementJay Wang2016-05-171-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Use runOnUiThread to ensure that UI element is accessed only by UI thread. CRs-Fixed: 993611 Change-Id: Ic2faab0813d273140d07f12c5e12a672ce699e1f
* | | SnapdragonCamera: add OTP calib data support and fix AE stateJay Wang2016-05-173-60/+257
| |/ |/| | | | | | | | | | | | | | | Add support to receive, parse, and send OTP calibration data from HAL to ClearSight library and add check for AE convergence state. CRs-Fixed: 993611 Change-Id: I52d6b71dc7bde4e08342afee7aa9d41bb9a4dde6
* | Merge "SnapdragonCamera: refactor clearsight code and add persist flags" ↵Linux Build Service Account2016-05-174-668/+837
|\ \ | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: refactor clearsight code and add persist flagsJay Wang2016-04-294-668/+837
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move out core ClearSight logic to ClearSightImageProcessor.java Move core ClearSight files to new package: org/codeaurora/snapcam/filter Add persist flags: timestamp difference threshold: persist.camera.cs.threshold burst shot count: persist.camera.cs.burstcount dump source frames: persist.camera.cs.dumpframes CRs-Fixed: 993611 Change-Id: Ic8953a72e8697e494c3ae342bebc70f60540474b
* | | Merge "SnapdragonCamera: Fix for layout stretching issue." into ↵Linux Build Service Account2016-05-171-1/+3
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix for layout stretching issue.Jack Yoo2016-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a device that layoutChangeListener is called later than layoutPreview is called. In this case, it fails to adjust the ratio. Adding checking routine for that. Change-Id: I717cd0ae1827f72eb15b7365001979d8fc4a66a8 CRs-Fixed: 1009374
* | | | Merge "SnapdragonCamera: Add null check before accessing mMenuHelp" into ↵Linux Build Service Account2016-05-171-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Add null check before accessing mMenuHelpJay Wang2016-04-291-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a corner case that onClick was triggered right after mMenuHelp is released. Therefore, add the null check and just ignore the onClick callback. Change-Id: Ibff54edfe9976f8355243a740b98a844f85711b0 CRs-Fixed: 1009970
* | | | Merge "SnapdragonCamera: Fix AF mode for touch-to-focus and taking snapshot" ↵Linux Build Service Account2016-05-172-25/+85
|\ \ \ \ | | |/ / | |/| | | | | | into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix AF mode for touch-to-focus and taking snapshotByunghun Jeon2016-04-292-25/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the current AF mode for snapshot. For touch-to-focus, use AUTO mode and reset to CAF after a delay. CRs-Fixed: 989750 Change-Id: I6318b05d57273c0a2fff5b3366faa471f6faaf85
* | | | Merge "SnapdragonCamera: Release audio focus when video recording is done" ↵Linux Build Service Account2016-05-171-1/+13
|\ \ \ \ | | | | | | | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | | 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: Support rotation for image review layout" into ↵Linux Build Service Account2016-05-177-30/+73
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Support rotation for image review layoutJay Wang2016-05-047-30/+73
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, image review layout is fixed to portrait mode. Changing the resources to use RotateImageView and update the scaling function in RotateImageView to support both up and down scaling of the image CRs-Fixed: 1004669 Change-Id: I6940227c634b7654bce5de5efe032aaa8da80e72
* | | | Merge "SnapdragonCamera: Fix incorrect focus mode" into camera.lnx.1.0-dev.1.0Linux Build Service Account2016-05-171-1/+5
|\ \ \ \
| * | | | SnapdragonCamera: Fix incorrect focus modeJay Wang2016-05-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The camera device parameter was not re-set when the camera is switched back from camcorder mode. This causes the camera mode uses previous camera focus mode which was selected before switching to camcorder mode. CRs-Fixed: 1006900 Change-Id: I20bce0413d7f422da86acd44c39b27582593614d
* | | | | SnapdragonCamera: Fix NPE in touch handling eventJay Wang2016-05-041-1/+4
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a chance that preview menu layout is removed when the touch event happens. Validate the pointer before passing the event to the preview menu layout. CRs-Fixed: 1008189 Change-Id: Ie29d48276e93b52720ddb7230ec50303e77e9176
* | | | Merge "SnapdragonCamera: resolve touch af issue during countdown" into ↵Linux Build Service Account2016-05-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: resolve touch af issue during countdownJay Wang2016-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to cancel any on-going focus request when new touch focus request is issued. In previous implementation, the CAF was not cancelled before re-issuing new focus region, and it causes the focus to freeze. Change-Id: I51365b4d363e5d8af3eac8fb0af0d6955f86ff33 CRs-Fixed: 1007029
* | | | | 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
* | | | | Merge "SnapdragonCamera: Replace SurfaceView with AutoFitSurfaceView" into ↵Linux Build Service Account2016-05-032-9/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | | SnapdragonCamera: Replace SurfaceView with AutoFitSurfaceViewByunghun Jeon2016-04-122-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace SurfaceView with AutoFitSurfaceView Change-Id: Id4bf27e3b16f12ff4cfdce47224ff871b3981838 CRs-Fixed: 989750
* | | | | | Merge "SnapdragonCamera: Add logic to calculate preview surface ratio" into ↵Linux Build Service Account2016-05-031-0/+76
|\| | | | | | |_|/ / / |/| | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Add logic to calculate preview surface ratioJay Wang2016-04-061-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file is copied from the commit : 51c65e100d6221c8e19d1345e40db2e7d1c5a190 src/com/android/camera/ui/AutoFitSurfaceView.java copied from media/Camera2Basic/Application/src/main/java/com/example/android/ camera2basic/AutoFitTextureView.java CRs-Fixed: 989750 Change-Id: I29a6fd2219991bda9aaa64f174a61b0aa5b71e87
* | | | | SnapdragonCamera: Temp fix to make both M and N compileLida Wang2016-04-302-2/+2
| |_|/ / |/| | | | | | | | | | | | | | | | | | | Temp fix to make app compile on both Android M and N CRs-fixed: 1007835 Change-Id: Ia3abac6d157b8e52d0998733e0a2dfbe194e0e94
* | | | Merge "SnapdragonCamera: Add support for ClearSight capture" into ↵Linux Build Service Account2016-04-298-105/+1234
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Add support for ClearSight captureCullum Baldwin2016-04-128-105/+1234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to capture ClearSight images. CRs-Fixed: 993611 Change-Id: Ifaeafa53ee5d095fe322e48f968cdeec03c64077
* | | | | Merge "SnapdragonCamera: Add support for outputting MPO format files" into ↵Linux Build Service Account2016-04-299-12/+1210
|\| | | | | |_|_|/ |/| | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Add support for outputting MPO format filesJay Wang2016-04-129-12/+1210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for generating MPO formatted files from the application layer. CRs-Fixed: 993611 Change-Id: I9a78d33e1d80b7da748f9bc75446f49172342078
* | | | Merge "SnapdragonCamera: Removing unnecessary orientation check" into ↵Linux Build Service Account2016-04-261-15/+0
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Removing unnecessary orientation checkJack Yoo2016-04-181-15/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing unnecessary code of checking the orientation. Swapping width and height causes redundant shrinking resulting to the wrong size calculation. Change-Id: I64badc2bd3198e409fe5673198e864d5025364e9 CRs-Fixed: 979254
* | | | Merge "SnapdragonCamera: Fix viewfinder flashing issue in camcorder mode" ↵Linux Build Service Account2016-04-262-4/+1
|\ \ \ \ | | | | | | | | | | | | | | | into camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Fix viewfinder flashing issue in camcorder modeJay Wang2016-04-152-4/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The preview cover is removed before the preview frame is generated and causes the homescreen shows up for a short duration. To resolve the issue, show the preview cover by default until the first preview frame is generated by camera framework. Change-Id: I1e193b64689b8b51eaa0e3891974405536869efd CRs-Fixed: 1003977