summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2" into ↵Camera Software Integration2016-12-221-2/+2
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2yingrenw2016-12-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Description: Solve the HFR Crash on 720 120FPS with Camera 2 when recording. Nullpointer crash. CaptureRequest native data copy don't have the tag data. Confirm the tag data can be copied. Change-Id: I745a09b789864db9cdbbe5cfcc8bcbc941e01bf3 CRs-Fixed: 1099749
* | Merge "SnapdragonCamera: Fix FC caused by session null" into ↵Camera Software Integration2016-12-201-1/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix FC caused by session nullqimengp2016-12-131-1/+1
| | | | | | | | | | | | | | | | | | Fix FC caused by session null Change-Id: I8f3b98cc47a10f25715bbb4c81accd87b2de432c
* | | SnapdragonCamera: Fix shutter button greyqimengp2016-12-131-2/+13
|/ / | | | | | | | | | | | | Shuter button will be grey in some situation. we need to reset Button state and state machine. Change-Id: I0c8170ff8338297659405d97ba9a7e2ae64b8f5f
* | SnapdragonCamera: Fix FC caused by mSession Nullqimengp2016-12-131-41/+90
| | | | | | | | | | | | | | | | | | | | | | | | There are lots of FC caused by mCameraDevice/mBuilder/mSession Null, In the condition: 1. Between opening camera app and not ready to preview. 2. App pause, and then resume to app 3. Restart session by makeup or flash mode change 4. restart all by change camera devices Checking NULL and add illegal state handler is a work around way. Change-Id: I26edfbde8944280c51f4a05f91deacb76e24b6f3
* | SnapdragonCamera: EIS is not enabled when enabling on the UIweijiew2016-12-131-1/+1
| | | | | | | | | | | | | | Stabilization on is not setted in request CRs-Fixed: 1099751 Change-Id: I6c905d26f459f0b232019830bca446e2d9f624d4
* | SnapdragonCamera: Fix don`t save the value about focus distancemingwax2016-12-131-7/+15
| | | | | | | | | | | | | | | | Don`t save the focus distance value when the user change the value. Add code for saving the value in xml when the user change the value. CRs-Fixed: 1095942 Change-Id: Ic2b88d67d068c17afcc12546028e99454070b8ab
* | SnapdragonCamera: Fix Don`t set setMaxFileSize when videoingmingwax2016-12-131-24/+171
| | | | | | | | | | | | | | Set the setMaxFileSize value when start recording video. CRs-Fixed: 1098808 Change-Id: I4fccb8b20040f3d56ce01626d5eedf671cc77b8f
* | SnapdragonCamera: Camera2 force close when turn on/off beautyweijiew2016-12-131-7/+6
| | | | | | | | | | | | | | Session was closed, but new session didn't create Change-Id: I09a03eef6386d4ebd7a988454503024af7ce1961 CRs-Fixed: 1066519
* | SnapdragonCamera:Avoid switching camera in countdownjunjiez2016-12-131-1/+1
|/ | | | | | | | | When countdown is over, there is a litter time before capture, and switch camera as this time will cause exception, so show the UI after both countdown and capture are over. Change-Id: I69f90d024f1fc70281db3ba38d9e078581e57d14 CRs-Fixed: 1094222
* Merge "SnapdragonCamera: Keep screen on when recording the video" into ↵Camera Software Integration2016-12-111-1/+29
|\ | | | | | | camera.lnx.1.0-dev.1.0
| * SnapdragonCamera: Keep screen on when recording the videomingwax2016-11-301-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | Add the actions to keep the screen on or off. (1) We always keep the screen on when click video button for recording video. (2) We keep the screen on for 2 mins when click video button for stop recording video. (3) We clear the flag(FLAG_KEEP_SCREEN_ON) when exit the camera. CRs-Fixed: 1095512 change-Id: I283c29882f0654315536afbafc5072491343a38f
* | Merge "SnapdragonCamera:Fix crash when zooming" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-111-2/+2
|\ \
| * | SnapdragonCamera:Fix crash when zoomingjunjiez2016-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The args of the message CANCEL_TOUCH_FOCUS is wrong, and the handler always get 0 as the cameraId, when mono-only is enabled, the cameraId is 2. Change-Id: Ib6a9a5831d0403bd9d9df6959ed35440ac42cc77 CRs-Fixed: 1092598
* | | Merge "SnapdragonCamera:closing sequence improvement" into ↵Camera Software Integration2016-12-111-2/+0
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera:closing sequence improvementjunjiez2016-11-301-2/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | when this is any camera with errors, invoke closeCamera to close them in sequence, do not close the one with errors first. Change-Id: I5cb2c206c16535f4a823c3a5545539cdbed5b6c7 CRs-Fixed: 1095549
* | | Merge "SnapdragonCamera:Camera reinit with wrong id" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-12-111-1/+1
|\ \ \
| * | | SnapdragonCamera:Camera reinit with wrong idjunjiez2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we swith sceneMode, Camera will call getMainCameraId() to get the camera id to reinit,but the camera id is wrong because valus in SettingsManager is null, so use init() instead, it will get camera id from preference. Change-Id: I1d7dc95ca5231ab1f98ae64ac5ffd0f6aae9bf7c CRs-Fixed: 1088851
* | | | Merge "SnapdragonCamera: make copy of location before altering timestamp" ↵Camera Software Integration2016-12-091-1/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: make copy of location before altering timestampJay Wang2016-11-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a copy of saved location object before altering timestamp since we may end up re-using the same location object down the line. CRs-Fixed: 1007285 Change-Id: Ifa8b7cd3ecfe2dede5cfa155818f48f51f4405f1
* | | | Merge "SnapdragonCamera: Camera2 force close after focused" into ↵Camera Software Integration2016-12-011-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | | SnapdragonCamera: Camera2 force close after focusedweijiew2016-11-241-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handler message leaks the camera id, the camera id is set to 0 when handleing Message.As we known, rear camera id is 0 and front camera id is 1. Focus action runs normall when switching to rear camera, but focus action will lead to force close when switching to fornt camera. Change-Id: I7795b7cd0c34c256d1ad0066d13a51ed54cec67d CRs-Fixed: 1094009
* | | | Merge "SnapdragonCamera: Fix Camera2 FC AlertDialog occur WindowLeaked" into ↵Camera Software Integration2016-12-011-0/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix Camera2 FC AlertDialog occur WindowLeakedmingwax2016-11-221-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The dialog occur WindowLeaked when attached the activity is destroyed. Add judgement whether the activity is finishing before show dialog, if true return, false show dialog. CRs-Fixed: 1082314 Change-Id: I28fab4c0253d2524a05e7e18a78d7651bdc9ce4a
* | | Merge "SnapdragonCamera: Fix Camera2 FC click video btn for many times" into ↵Camera Software Integration2016-11-281-6/+93
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix Camera2 FC click video btn for many timesmingwax2016-11-181-6/+93
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RootCause: Design fault, missing code which capture exception. Code is not robust. Solution: Add code for catching exception and add listener for MediaRecorder occur error. Optimize toast tips. CRs-Fixed: 1088238 change-Id: I48fd8f91d1fc24ddc458f28c1eadd277bc3b34d9
* | | Merge "SnapdragonCamera: Camera2 force close when zoom focus ring in video ↵Camera Software Integration2016-11-281-2/+4
|\ \ \ | | | | | | | | | | | | mode" into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Camera2 force close when zoom focus ring in video modeweijiew2016-11-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When starting recording, a new captureSession will be created and the old captureSession will be closed, but it still use old captureSession to apply new zoom value. Change-Id: I3c8b1f5346eddc2ffbb454a94cd401812276e4a5 CRs-Fixed: 1089903
* | | | Merge "SnapdragonCamera: Shutter button was disabled after switching to ↵Camera Software Integration2016-11-281-1/+13
|\| | | | | | | | | | | | | | | video mode" into camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Shutter button was disabled after switching to video modeweijiew2016-11-171-1/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Video mode was not supported when triggering continue shot, when continue shot was triggered, video button was not disabled and led to shutter button can't restore to enable. Solution: Disable video button when triggering continue shot;disable continue shot when recording video Change-Id: If30323e6a3f9b39ce6c5f3a8c74d78ac7526c382 CRs-Fixed: 1085338
* | | Merge "SnapdragonCamera: Improve onResume" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-281-14/+43
|\ \ \
| * | | SnapdragonCamera: Improve onResumeJay Wang2016-11-141-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create session without waiting for surface to be ready and start preview when surface is ready. This improves latency Change-Id: I1d4aee1c854c20c9e1e54a0d513da94265c1bf78 CRs-Fixed: 1066519
* | | | Merge "SnapdragonCamera: Add ProMode" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-281-9/+42
|\| | | | |/ / |/| |
| * | SnapdragonCamera: Add ProModeByunghun Jeon2016-11-141-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | Add ProMode. User can change iso, white balance, exposure, and focus mode using this new scene mode Change-Id: I58885d3a05d6d9e8264e58cb8c4de2e1f13646b0 CRs-Fixed: 1089100
* | | Merge "SnapdragonCamera: Scene mode change" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-151-16/+26
|\| |
| * | SnapdragonCamera: Scene mode changeJack Yoo2016-11-091-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | Adding Sharpshooter, Stillmore scene mode menu Moving Tracking focus to the scene mode Change-Id: I5afb2499e767d90f0e0e6408168961bcda4e55bb CRs-Fixed: 1083651
* | | Merge "SnapdragonCamera: Continuous shot to YUV" into camera.lnx.1.0-dev.1.0Camera Software Integration2016-11-151-21/+49
|\| |
| * | SnapdragonCamera: Continuous shot to YUVJack Yoo2016-11-091-21/+49
| | | | | | | | | | | | | | | | | | | | | Change continuous shot to YUV with ZSL Change-Id: If69d58456a17fa4181cf58f9660c0c6d033c4938 CRs-Fixed: 1083651
* | | Merge "SnapdragonCamera: Update preview UI when recording rest time was ↵Camera Software Integration2016-11-151-1/+21
|\| | | | | | | | | | | zero" into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Update preview UI when recording rest time was zeroweijiew2016-11-071-1/+21
| | | | | | | | | | | | | | | | | | | | | Update preview UI when the recording rest time was zero Change-Id: I538cac957a6c467974e0381ee6cab34dee7fdcfd CRs-Fixed: 1085359
* | | Merge "SnapdragonCamera: Add face detection for camera2 video record" into ↵Camera Software Integration2016-11-151-1/+2
|\| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Add face detection for camera2 video recordRanjith Kagathi Ananda2016-11-071-1/+2
| | | | | | | | | | | | | | | | | | | | | Enable face detection for video recording as well CRs-Fixed: 1084703 Change-Id: Icbd80f10c1af70e6aa8a1dcbdede1b331086eae3
* | | Merge "SnapdragonCamera: update face view for video recording use-case" into ↵Camera Software Integration2016-11-151-2/+5
|\| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: update face view for video recording use-caseJay Wang2016-11-071-2/+5
| | | | | | | | | | | | | | | | | | | | | Update face view for video recording use-case Change-Id: Id8ed2053e0a850d0bbf5666abf03c0ab605af2e9 CRs-Fixed: 1084703
* | | Merge "SnapdragonCamera: Adjust video encoder bit rate and add 60fps ↵Camera Software Integration2016-11-151-58/+66
|\| | | | | | | | | | | support" into camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Adjust video encoder bit rate and add 60fps supportJay Wang2016-11-071-58/+66
| | | | | | | | | | | | | | | | | | | | | | | | - Configure the video encoder bit rate to the recommended value - Add 60fps video frame rate support Change-Id: I477487c4c4fab5479534896d90e08c3eadddc54f CRs-Fixed: 1074187
* | | Merge "SnapdragonCamera: Fix torch mode with continuous shot" into ↵Camera Software Integration2016-11-151-9/+38
|\| | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix torch mode with continuous shotJay Wang2016-11-071-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | Flash torch mode sometime doesn't work because the flash mode is overwritten by repeating preview request. To resolve the issue, re-configure the preview request with new flash mode. CRs-Fixed: 1077543 Change-Id: I614bac704562925cc843a9b8db2852c71368f4e5
* | | Merge "SnapdragonCamera: Fix FC when tap flash button continously" into ↵Camera Software Integration2016-11-101-0/+4
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 22:19:18 +0000