summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* SnapdragonCamera: Fix reversed video flash mode buttonsSultanxda2015-09-171-4/+4
| | | | | | *Previously, setting the "off" option would enable flash, and setting the "on" option would disable it SnapdragonCamera: Fix reversed video flash-mode icons
* Snapdragon Camera: Use consistent API for preview fps resetEmilian Peev2015-08-292-5/+12
| | | | | | | | | | Instead of using preview fps range API during preview framerate reset use the fixed fps API. This is to avoid any inconsistent behavior that can be triggered when using both APIs from MediaRecorder and Snapdragon application side. Change-Id: Ib5251d8ea4d697db9bdea4e5ebf20606b286f54f
* Snapdragon Camera: Avoid possible race conditionEmilian Peev2015-08-291-0/+9
| | | | | | | | | | | | | | | | | | Camera open and preview start are currently executed in a separate thread different from the main handler thread. If the main thread tries to switch the camera immediately after the open camera thread starts a race condition is possible. This race condition can lead to a failing assert in CameraHolder which can receive two camera open requests one after another. To resolve this the main handler thread needs to check whether an open camera thread got initialized and started previously. If the check is positive, it needs to wait until the separate thread finishes before proceeding with the camera switch sequence. Change-Id: I409e3158bc976120de31540351ea8e55fddbca46
* Validate preview format before setting it to camera device.Santhosh Kumar H E2015-08-292-2/+14
| | | | | | | | | For 720p and 1080p video resolutions, nv12_venus preview format is being set. But few targets doesn't support this preview format. So validate the preview format with supported list before setting it to camera device. Change-Id: I29b3b2b412b04abf82c61c732414e00aa1bff243
* Camera: Set preview fps after recording.Suman Mukherjee2015-08-291-0/+12
| | | | | | | | 4k DCI recorded FPS is getting picked up from profile and not getting reset to preview FPS after stop recording. Fix made to set the preview FPS range after stop recording. Change-Id: I4892e6fcee3eefbcbd6ca9426e56e2303cdad844
* Initialize focus overlay manager if it is not initialized.Santhosh Kumar H E2015-08-291-3/+9
| | | | | | | | | | | Camera open thread initializes the focus overlay manager after opening camera. In a rare scenario above background thread had not initialized focus overlay manager by the time UI thread start acessesing it, so we see a crash. Initialize focus overlay manager from UI thread if it is not initialized already. Change-Id: I1635c8759d0e0647fe61fe975a0cc24df40df529
* Camera2: Disable SeeMore feature during 4K videoShwetha Kotekar2015-08-292-2/+16
| | | | | | | If the video resoultion is 4K, disable SeeMore and show a toast message Change-Id: Ieb947f889d92fb8f9af5bf52c865555dce7eb1c4
* Snap: Use AOSP app labelMichael Bestas2015-08-293-6/+4
| | | | Change-Id: I3d589945ea31f40890a94b43555268b6b3060e37
* Snap: Update launcher iconjrizzoli2015-08-295-0/+0
| | | | | Change-Id: I71dd8eef7fddf4f0e7f779612ea39a923bf7ac0f Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
* Rename SnapdragonCamera to SnapMichael Bestas2015-08-296-11/+13
| | | | Change-Id: I1474550af7f45e53aa97819b42a91c961eeb6684
* Merge fa458f0a64a6b4412912c9177ec0fbeed084a28f on remote branchLinux Build Service Account2015-08-065-167/+154
|\ | | | | | | Change-Id: Ib0ecc314a7bd0b76c8e955402d9adfe0a4989223
| * SnapdragonCamera: remove nav bar to enable full screen previewByunghun Jeon2015-08-035-167/+154
| | | | | | | | | | | | | | Remove the navigation bar in order to take advantage of full screen. Change-Id: I25f42af825c4f3b7ad6521c2ee6d62fa4219044a CRs-Fixed: 865254
* | Revert "SnapdragonCamera: Move focus mode to developer mode"Gopal G Goberu2015-08-031-1/+2
| | | | | | | | | | | | This reverts commit 4d37b1187636819cc06ef099fdf2ac7a5fec49f5. Change-Id: I58866cba3af38dee6416714be7458d766f7560ce
* | Revert "SnapdragonCamera: Modify snapcam per Lanix requirements"Gopal G Goberu2015-08-032-0/+86
| | | | | | | | | | | | This reverts commit 9718d52b226489ad60df5934fb86fed219330a91. Change-Id: I13fd76e075935013786165e6732b5d8e11b46132
* | Revert "SnapdragonCamera: Reduce number of countdown timer option"Gopal G Goberu2015-08-031-2/+2
| | | | | | | | | | | | This reverts commit 57d77499b09d207187c8a1051bf043ba9fb43c84. Change-Id: I91faf90357f5563e594756c0b7a942c34bbee344
* | Merge 5c05aaa8664172755c0f5cf6920e518a8abca067 on remote branchLinux Build Service Account2015-07-273-88/+1
|\ \ | | | | | | | | | Change-Id: I4b111d981352b99ff7f9e6c2dc43915d30aef16b
| * \ Merge "SnapdragonCamera: Move focus mode to developer mode"Linux Build Service Account2015-07-211-2/+1
| |\ \
| | * | SnapdragonCamera: Move focus mode to developer modeByunghun Jeon2015-07-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move focus mode to developer mode since it cannot be selected unless ZSL is turned on which is also in developer mode Change-Id: Id441da1c706f8151df2fc291247e8267428d19b6
| * | | SnapdragonCamera: Modify snapcam per Lanix requirementsByunghun Jeon2015-07-142-86/+0
| |/ / | | | | | | | | | | | | | | | Provide required picture size/quality, and video resolution entries Change-Id: I165fa1c1af1996ab1b94ceb7dbf96be7478807a9
* | | SnapdragonCamera: honor video duration limit in intentLikai Ding2015-07-231-10/+8
| | | | | | | | | | | | | | | | | | | | | The video duration limit read from intent is later overwritten by the value from preference. Change the order to honor the intent value. Change-Id: I833b1fbcecbbaeff48ff51144f5e584e91fb1838
* | | Merge "SnapdragonCamera: Don't disable the camera"Linux Build Service Account2015-07-232-2/+2
|\ \ \
| * | | SnapdragonCamera: Don't disable the cameraWei Ding2015-07-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Don't disable the camera activities if atleast one camera is detected. 2) Pass CameraID to know profile is supported or not. Change-Id: I307bf0c5ca228eef2ae69596f648fbdabff83398
* | | | Merge 96e833287108de4dbcab48bab30637a9d751de43 on remote branchLinux Build Service Account2015-07-061-0/+5
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: Id3b9c49abaf37f414e116a0bd8c25671c5db0db8
| * | Merge 2006781dcbfb7a7885922d5ccb94e41b55b7e9ed on remote branchLinux Build Service Account2015-07-062-3/+23
| |\| | | | | | | | | | Change-Id: Ic93d1c84122b5aaf6b852f0797badf124d12ed5f
| | * Merge "SnapdragonCamera: Add the real image size to media provider db"Linux Build Service Account2015-07-021-0/+5
| | |\
| | | * SnapdragonCamera: Add the real image size to media provider dblikaid2015-06-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The image size may change after add the jpeg exif header. If the real file size was not match the _size column in media provider database, the picture will not be opened on PC via MTP mode. Get the real file size after add exif, and save it into provider db. Change-Id: I832d24f4e38e0fd2e2f0fa536bb94927c4ab442a CRS-Fixed: 854308
| | * | SnapdragonCamera: Add new preview aspect ratio for 3:2 pictureslikaid2015-06-301-3/+18
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | When the captured picture was 3:2 aspect ratio (e.g 720x480), the image was deformed on camera preview, since it was treated as 4:3 ratio on preview layout. Change-Id: I4c170f53c9dfdc7e90ee736631be02cef1f574c2 CRs-Fixed: 857138
* | | SnapdragonCamera: Add new preview aspect ratio for 3:2 pictureslikaid2015-07-021-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the captured picture was 3:2 aspect ratio (e.g 720x480), the image was deformed on camera preview, since it was treated as 4:3 ratio on preview layout. Change-Id: I4c170f53c9dfdc7e90ee736631be02cef1f574c2 CRs-Fixed: 857138
* | | Merge 17b1263029655fee3611f92993ae864d8acd1d1d on remote branchLinux Build Service Account2015-06-303-0/+14
|\| | | | | | | | | | | Change-Id: I0a3817609dff98fec486666e2b63686c075f1ae3
| * | SnapdragonCamera: Fix Zoom orientationByunghun Jeon2015-06-243-0/+14
| | | | | | | | | | | | | | | | | | Fix Zoom UI's orientation Change-Id: I9c14b08729e099c263d612289ccb8b7ed757168b
* | | Merge "SnapdragonCamera: Synchronize shutter button click."Linux Build Service Account2015-06-181-1/+1
|\ \ \
| * | | SnapdragonCamera: Synchronize shutter button click.Sai Kumar Sanagavarapu2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In monkey usecases, shutter button can be clicked really fast even before app's state is set properly. This can lead to multiple takepicture calls to lower layers. Since HAL maintains state machine and doesnt allow such operations, error will be thrown. To avoid such situations, make onShutterButtonClick() a synchronized method so that only one thread can access it at a time. Change-Id: Icbb052966dc671521bafb3404f4ced58d723bc71
* | | | SnapdragonCamera: To pass Auto HDR status using stringAbhishek Pant2015-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Made changes to pass Auto HDR enable/disable status from Applicaiton to HAL using string instead of key Change-Id: I6e8d1b83e10b390f4d5a8eee113238797316e821
* | | | Merge b0ea048bd5a7a5f05353a03e46c68a9033f436de on remote branchLinux Build Service Account2015-06-161-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: Ie693f6e825fc448c6303315592eb4192ef5765ea
| * | | Merge 9a0d0cbc63632d50c03bbd18597a3b8db1d83303 on remote branchLinux Build Service Account2015-06-081-0/+3
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I17e24633ed9618c9bffb89703e15b5fe3faa067d
| * | | SnapdragonCamera: Reduce number of countdown timer optionJay Wang2015-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reduce countdown timer option to "off, 2 secs, 5 secs and 10 secs" Change-Id: I7ee49c0b7b7e8649b6d128d58de3562549ec2644
* | | | Merge 9a0d0cbc63632d50c03bbd18597a3b8db1d83303 on remote branchLinux Build Service Account2015-06-111-0/+3
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | Change-Id: I7c9a290836bb0892d81f7cb329c1d70d298661d5
| * | Camera: Avoid state switch during preview startEmilian Peev2015-06-031-0/+3
| |/ | | | | | | | | | | | | | | | | If snapshot is running avoid changing the camera application state during handling of 'ON_PREVIEW_STARTED' messages. Change-Id: I1654752d431d41d3219f235a08f77e1d7dd10c27 CRs-Fixed: 747816
* | SnapdragonCamera: Fix DUT flash main menu when open camera.likaid2015-05-161-2/+1
| | | | | | | | | | | | | | | | | | | | When the process of opening camera, the background layout has no content which cause the main menu show. When open camera, make the background layout exist. Change-Id: If6075c652b6c9973d201cff1e537522c87c4f0ff CRs-Fixed: 822737
* | Merge "SnapdragonCamera: Longshot with Burst Functionality."Linux Build Service Account2015-05-143-19/+60
|\|
| * SnapdragonCamera: Longshot with Burst Functionality.Vijay kumar Tumati2015-04-243-19/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 AEC lock issue after non-zsl snapshot.Sai Kumar Sanagavarapu2015-05-081-1/+4
|/ | | | | | | | | In non-zsl snapshot, focus manager is set to unlock AEC after setting camera parameters in startpreview(). Due to this, AEC gets unlocked only after next touch focus or any set param call. Fixed this by changing the order during startpreview(). Change-Id: I320d7b37c7107ce2242a52979505ff04029a83fa
* Merge "SnapdragonCamera: Customize camera video quality"Linux Build Service Account2015-04-152-1/+9
|\
| * SnapdragonCamera: Customize camera video qualitylikaid2015-04-152-1/+9
| | | | | | | | | | | | | | | | | | | | | | SnapdragonCamera's default video quality value was set to highest supported video resolution whitch was "720P" Add the default video quality value string "pref_video_quality_default" and overlay it to "VGA" CRs-Fixed: 815638 Change-Id: I5013880a42028e0663a3d22ffa3cddf87990146b
* | Merge "Merge commit 'bfdb90d53112474a71c9a39c259d9d9676224f94'"Linux Build Service Account2015-04-151-7/+5
|\ \
| * \ Merge commit 'bfdb90d53112474a71c9a39c259d9d9676224f94'Abhishek Ranjan2015-04-141-7/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com/android/camera/PhotoModule.java Change-Id: Ic27022cce6728704aeabcbb6bbcdf75850e45eaa
| | * \ Merge "SnapdragonCamera: fix crash during module switch"Linux Build Service Account2015-04-131-2/+2
| | |\ \
| | | * | SnapdragonCamera: fix crash during module switchLikai Ding2015-04-101-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When module is switched from camcorder to camera, on UI thread, it calls setFlipValue and then setParameters in onOrientationChanged. Meanwhile, background OpenCameraThread is modifying mParameters in startPreview(). This leads to a ConcurrentModificationException. Check camera state in onOrientationChanged. If it's not IDLE, skip setFlipValue and setParameter since these will be done in startPreview. This change also fixes camera UI orientation during a landscape launch. Change-Id: I15ed1e2bbbfc95f1b53b7309b72942d98350c564 CRs-Fixed: 815034
* | | | Merge "SnapdragonCamera: customize camera picture quality"Linux Build Service Account2015-04-154-8/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | SnapdragonCamera: customize camera picture qualitylikaid2015-04-094-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | regional feature Change-Id: I4c80b4970ff4f628080cad20980aa545add6fdcf CRs-Fixed: 815630