summaryrefslogtreecommitdiff
path: root/src/com/android/camera/CaptureModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| * | | SnapdragonCamera: Fix FC when tap flash button continouslymingwax2016-11-021-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | When user tap flash button continously, camera session occur error, and throw IllegalStateException. Because session has been closed, further changes are illegal. Solution, use try/catch to capture the IllegalStateException. Change-Id: Ib2349673e1ab34b9a897e3e7c96cfa6c7744b80c CRs-Fixed: 1084774
* | | Merge "SnapdragonCamera: Fix press volume key can`t take picture" into ↵Camera Software Integration2016-11-101-0/+35
|\ \ \ | | | | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | | SnapdragonCamera: Fix press volume key can`t take picturemingwax2016-11-011-0/+35
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Did not implement the code. Add code in onKeyDown and onKeyUp method refer to PhotoModule.java. Add the listening which the user press the volume key down or up. Change-Id: I5380d3fcad146fccadf7d1657c4e2e79f218f75e CRs-Fixed: 1084315
* | | Merge "SnapdragonCamera: Fix didn`t take picture when switch sdcard" into ↵Camera Software Integration2016-11-101-2/+6
|\ \ \ | |_|/ |/| | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Fix didn`t take picture when switch sdcardmingwax2016-10-311-2/+6
| |/ | | | | | | | | | | | | | | | | | | | | The phone has no SDCard, When user change Storage from phone to SDCard, the onSettingsChanged method is not called. Because CaptureModule in an invisible state to user. So I put updateSaveStorageState method in onResumeAfterSuper method, in order to be able to update in time. Change-Id: I1e0129adc4ec5ccb80583befe737883e2922e8ca CRs-Fixed: 1083378
* | Merge "SnapdragonCamera: Reset zoom value when resuming" into ↵Camera Software Integration2016-11-021-0/+1
|\ \ | | | | | | | | | camera.lnx.1.0-dev.1.0
| * | SnapdragonCamera: Reset zoom value when resumingByunghun Jeon2016-10-131-0/+1
| | | | | | | | | | | | | | | | | | | | | When pause/resuming, reset zoom value to default value Change-Id: Ib1313009cfd8c44daa2032d20da863fe10eeddf0 CRs-Fixed: 1066519
* | | SnapdragonCamera: Blurbuster filterJack Yoo2016-10-201-0/+3
| | | | | | | | | | | | | | | | | | | | | Adding blurbuster filter to the post processor Change-Id: I2958a2b1b0df834c4cb5b921e49d21d2e20c8377 CRs-Fixed: 1080317
* | | SnapdragonCamera: PanoramaUI and filter changeJack Yoo2016-10-201-5/+3
| |/ |/| | | | | | | | | | | | | | | | | 1. Adjusting Panorama UI 2. Adjusting Chormaflash filter 3. Changing Ubifocus focus timeout value 4. ZSL Flash mode change Change-Id: Ia46fdc827cd5529a8b7c6f5cfafc44bb3cf00d06 CRs-Fixed: 1080317
* | SnapdragonCamera: Use flash torch mode during continuous shotJay Wang2016-10-141-9/+22
|/ | | | | | | | When flash is turned on during continuous shot, flash is configured to torch mode. Change-Id: I8993bcfd974a34319193c5cf35e94c5f0d04346f CRs-Fixed: 1077543
* SnapdragonCamera: Fix setting video resolution for makeupByunghun Jeon2016-10-131-27/+9
| | | | | | | | | Turning on makeup forces video resolution to be 720x480 which might not be supported by the device. Use one that is equal to or smaller than that. Change-Id: Ife16bf862432e4579d353c0d21179210d9b0957b CRs-Fixed: 1066519
* SnapdragonCamera: frame capture pathJack Yoo2016-10-131-33/+57
| | | | | | | | | | | Frame the path for each capture. 1. ZSL image -> YUV reprocess -> filters -> framework jpeg encoding 2. Non-ZSL -> filters -> framework jpeg encoding 3. Optimizing bestpicture filter image saving 4. Adjusting roi according to the mirror Change-Id: I8989ec57beec3420e6f4311dff951af0a84f5ba9 CRs-Fixed: 1071798
* SnapdragonCamera: SelfieMirror Camera2Jack Yoo2016-10-131-3/+7
| | | | | | | SelfieMirror filter for camera2. Change-Id: Id5fda369a56421199a8c2537491608b8667fb77e CRs-Fixed: 1071798
* SnapdragonCamera: Restart session instead restartJack Yoo2016-10-131-57/+72
| | | | | | | Restart the session instead of restarting on ZSL mode change. Change-Id: Idc484c592d2ca0a32e60b3a70380fd309f559dcd CRs-Fixed: 1071798