summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/AndroidCameraManagerImpl.java
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: Adding current camera null checkJack Yoo2016-08-031-1/+2
| | | | | | | Adding null check on potential race condition case. Change-Id: Ia837acbdf5fbef824d55b318d9cbddf8a8faf7ef CRs-Fixed: 961548
* SnapdragonCamera: Handle startPreview exception in camera.Sanjeev Garg2016-08-031-4/+24
| | | | | | | | | | If any exception occurs in start preview then camera app should handle this exception and should display error pop-up and exit gracefully. CRs-Fixed: 919778 Change-Id: I80b60224d5d47a96dad78c40f8a23e3e9be45e65
* Snap: Tighten openLegacy() try-catch blockZhao Wei Liew2016-07-121-13/+14
| | | | | | | | We only have to enclose the openLegacy() call in a try-catch block. This prevents us from re-calling open() when open() fails and throws a RuntimeException. Change-Id: I81396e453f57215338a0c4da41c4116f2b4d42ca
* Snap: Add missing return for SET_ONESHOT_PREVIEW_CALLBACK caseSultanxda2016-04-181-0/+1
| | | | | | Don't fall-through here. Change-Id: I38324b3182a01ab6269998971802f69e3c2cd286
* SnapdragonCamera: fix screen flash on resumingLikai Ding2016-01-081-0/+11
| | | | | | | | | 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. CRs-Fixed: 881290 Change-Id: I5d93e57f0b9aa338c6b34461d5e3ee31806b6706
* SnapdragonCamera: Make direct shutter callbacks configurableEmilian Peev2016-01-071-3/+17
| | | | | | | | | | | | | | | | | | | | Calling shutter callbacks directly decreases the delay with which 'takePicture' calls are triggered during continuous burst capture. As such more time is spent processing and starting next snapshots resulting in a less responsive UI thread. The preview doesn't actually hang or stop but only the UI is not be able to update it as frequently as before. In order to avoid this but also have the burst perfomance enhancement as well a configurable Android property is added: "persist.camera.direct.cb -> 0/1" which when disabled will post shutter event callbacks like before on the UI thread and when when enabled will trigger them directly. Change-Id: Id6fd747eeb19026791faa1ce9db20302767a7695 CRs-Fixed: 794460
* Snapdragon Camera: Call shutter callbacks directlyEmilian Peev2016-01-071-7/+2
| | | | | | | | | | | | Currently shutter callbacks are triggered by posting a 'Runnable' task on the application main handler thread. In some cases when the handler thread is busy, the processing of the shutter event can take significant time, which during longshot will lead to an overall slow down. Change-Id: Ie79f7a7be61e92f82e6d4ed177a4785aceeb811b CRs-Fixed: 759621
* make openLegacy an optioncodeworkx2016-01-051-4/+22
| | | | Change-Id: Ia4142288ef0fafa62fa0ab855dc342b363b640cd
* Snap: Cleanup video profile handlingMichael Bestas2015-09-171-1/+8
| | | | | | | | | | | | | | * Fix camcorder crashes on older devices Revert "SnapdragonCamera: Fix compatibility issues with KK." This reverts commit 0d33346534a728a1f8efaec05fcdccbe3e5440e1. Revert "SnapdragonCamera: Throw error popup for unsupported video profile." This reverts commit 3e50703cff0bc243b922a2299c58a45a4cbd91a9. Change-Id: I1152180a590650a7583430936f3759d1831e91dd
* SnapdragonCamera: Longshot with Burst Functionality.Vijay kumar Tumati2015-04-241-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new Longshot feature where in the snapshot frames captured at ISP is @ 3fps and output JPEG encoded rate is @ 1.2 fps. This can be enabled by setting following setprop with the maximum number of snapshots. adb shell setprop persist.camera.longshot.max <max_number> e.g.:adb shell setprop persist.camera.longshot.max 10 If the number is -1, then the existing Longshot will be used. Main changes: 1) The number of Snapshot/Preview/Metadata buffers are increased to make sure no frames will be dropped @ ISP and to maintain burst fps. e.g.: For max number of 10 snapshots, Snapshot buffers are increased to 9 from existing 6. This buffer numbers are derived considering snapshot YUV frames @ 3 fps and JPEG encoding @ 1.2 fps. 2) Shutter will be played after receiving YUV frame instead of reprocess frame. 3) New Longshot stop command is sent after receiving all the required YUV callbacks or releasing the shutter before reaching Max number. 4) Existing Longshot off command is sent after receiving all JPEG CB.s for the issued TakePictures() and also shutter button will be disabled until all the JPEG callbacks are received. Change-Id: Id0c21aeb67245530768bf3ab859d39dea7e2bc40
* SnapdragonCamera: Fix null pointer exception during monkey testlikaid2015-02-091-1/+1
| | | | | | CRs-Fixed: 788421 788422 788437 788445 Change-Id: Ie77a53a73182b6642ce2e9f7de7c4c127e192f51
* SnapdragonCamera: Fix compatibility issues with KK.Sai Kumar Sanagavarapu2014-11-261-8/+1
| | | | | | | | | 1. Remove openLegacy call to open camera. 2. Use generic camcorder profile query mechanism instead of hardcoding profile enums in app. 3. Fix NPE during startpreview if mParameters is null. Change-Id: I7bfc00f68f512c3029ca8ba75863583f1b376094
* Camera: openLegacy to open HAL1 cameraRanjith Kagathi Ananda2014-10-081-1/+8
| | | | | | | | When HAL 3 module is enabled by default, use .openLegacy with api version CAMERA_HAL_API_VERSION_1_0 to get the HAL1 device instead of the regual .open call. Change-Id: Iec16c0b4e30f431bff4f4ad8bb83533f328c12b4
* Camera2: Fix callback with old data after camera switchIvan Evlogiev2014-06-201-6/+30
| | | | | | | - Fix race condition for calling camera callbacks with old data after camera switch Change-Id: If63e7903f3e7821220397b1b8cea4d9478ba3c94
* Camera2: Adding support for Auto HDRAbhishek Pant2014-06-061-1/+11
| | | | | | | | Adding support for Auto HDR for camera application. CRs-fixed: 629556 Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
* Camera: Add checker for null pointer exception during camera releaseSanthosh Kumar Thimmanna Bhattar2014-01-131-0/+3
| | | | | | | | | | In current code, handler will still try to execute command even camera is closed, so add null point checker to skip these commands ( cherrypicked from commit 63ae64c56b00f44956502822a0ddb96307ae7270 ) Change-Id: I71c30a5293364e084de650e92d9d0926e7e3d7c1 CRs-Fixed: 598600
* Camera2: Fix concurrency issues with camera messagesSanthosh Kumar Thimmanna Bhattar2014-01-131-4/+10
| | | | | | | | | | | Without this, multiple threads are trying to access same data and resulting in crash. ( cherrypicked from commit d11040c561e9add30768947aa93235ff08de03b1 ) Change-Id: Ib09950d6640afcd7962cba9ea5385d778f022abe CRs-Fixed: 542706
* Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-3/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix crash when trying to reopen the camera.ztenghui2013-10-281-2/+8
| | | | | | | | | | | | | | | | | | In this case, another app is using the Camera, such that the camera.open will hit an exception. We should show an dialog here. bug:11258139 Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111
| * Fix memory leak due to inner class for handler.ztenghui2013-10-281-1/+4
| | | | | | | | | | | | | | | | To keep the existing interface, we just overwrite the handler here. bug:11336965 Change-Id: I77b2f577279244439ee9f81344f47bf5773e527b
| * Don't crash when preview surface could not be set.Sascha Haeberling2013-10-171-1/+1
| | | | | | | | | | | | Bug: 11021188 Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
* | Camera2: Adds support for longshot/burst modeAlok Kediya2013-11-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The longshot/burst pipeline mode uses an optimized path for triggering 'takePicture()' on each shutter callback. This should improve the shot-2-shot time. In addition to this there is also support for jpeg callbacks that only contain a jpeg file path. The callback in this case will only move the file stored by the lower layers in the correct directory. - The longshot burst pipeline can be enabled via this property: "persist.camera.longshot.enable"<-"0/1" - This change will allow longshot mode to be triggered in non-zsl mode as well. (Cherry picked from: I693366a7d06d3b386a8d96f86ee9a0574749c50b) (Cherry picked from: Id630b2033f18d1c04a636597e910e695a8692ac8) Change-Id: Idda8d58fc6d889128c1812c9c5ddadca3993c246
* | Camera : Enable camera and camcorder UI features..Alok Kediya2013-10-311-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added keys and APIs for enabling QC features from UI. (cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21) Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8 Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/VideoModule.java (cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376) (cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
* | Don't crash when preview surface could not be set.Sascha Haeberling2013-10-211-1/+1
|/ | | | | | Bug: 11021188 Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
* Clean up ApiHelper and remove unused code paths.Sascha Haeberling2013-09-181-12/+5
| | | | | | | | | Bug: 10821545 As we're targeting ICS there are a lot of checks and code paths that are no longer in use. This CL cleans them up. Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
* Merge "Don't crash the app if camera is not available." into ↵Sascha Haeberling2013-09-171-0/+3
|\ | | | | | | gb-ub-photos-carlsbad
| * Don't crash the app if camera is not available.Sascha Haeberling2013-09-171-1/+4
| | | | | | | | | | | | Bug: 10747001 Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c
* | Show dialog when camera device is not connected.Angus Kong2013-09-171-5/+81
|/ | | | | | bug:10726516 Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
* Clean up Gallery codes.Angus Kong2013-08-091-2/+2
| | | | | | bug:10263696 Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-061-3/+3
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Add wrapper for face detection listener.Angus Kong2013-07-311-36/+78
| | | | | | bug:10113532 Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
* Fix switching camera failure.Angus Kong2013-07-311-1/+1
| | | | | | bug:10110830 Change-Id: I1adcefc229ce4a245880bc037a086c949c73da55
* Refactor CameraManager.Angus Kong2013-07-291-0/+737
1. CameraManager should be the only class accessing android.hardware.Camera. 2. For potential future upgrade in Camera HAL and android.hardward.Camera API upgrade, CameraManager should be just an interface instead of concrete implementation. 3. waitDone() in CameraProxy is removed. 4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are wrapped by our own interfaces. Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465