summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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-271-2/+1
|\ \ | | | | | | | | | Change-Id: I4b111d981352b99ff7f9e6c2dc43915d30aef16b
| * | 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: 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
* | 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-151-1/+7
|\
| * SnapdragonCamera: Customize camera video qualitylikaid2015-04-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | 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
| | * | 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: Fix setting icons display abnormal."Linux Build Service Account2015-03-181-2/+1
| | |\ \
| | | * | SnapdragonCamera: Fix setting icons display abnormal.likaid2015-03-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When switch to camera in landscape, the UI is not to set to landscape which make the setting icon display abnormal. When switch to camera in landscape, make the UI to reset the orientation. Change-Id: I7c49cf7ac2bebfc2debd5b6e90449931ca6d6d74 CRs-Fixed: 803557
| | * | | SnapdragonCamera: Fix preview broken when coming back from galleryByunghun Jeon2015-03-061-3/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix preview broken when user goes to gallery using thumbnail in portrait, rotates to landscape in gallery and back key to come back to camera Change-Id: Ib9a8ce69bfbb85573cae55da79901705f726cc22 CRs-Fixed: 802169
* | | | 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
* | | | Merge "SnapdragonCamera: Popup menu doesn't support RTL mode"Linux Build Service Account2015-04-144-74/+181
|\ \ \ \
| * | | | SnapdragonCamera: Popup menu doesn't support RTL modelikaid2015-04-114-74/+181
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coordinate direction is opposite in RTL mode. Modify Coordinate direction in RTL mode. Change-Id: I3fcd42fc27d430b486f9cccdde5ecec0d0468d30 CRs-Fixed: 819310
* / | | SnapdragonCamera: longshot memory check fixLikai Ding2015-04-131-18/+20
|/ / / | | | | | | | | | | | | | | | | | | | | | getCachedSize() has been changed recently resulting in an increased failure rate. Restore old behavior in longshot memory check. Also, remove some class members to save a little memory. Change-Id: Ib5c22201be04387ffecb4052a8bbc92b2e924deb
* | | Merge "SnapdragonCamera: Gallery2 Can't show the newest picture"Linux Build Service Account2015-04-101-0/+2
|\ \ \ | |/ / |/| |
| * | SnapdragonCamera: Gallery2 Can't show the newest picturelikaid2015-04-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera give Gallery2 the newest picture's index is wrong in RTL mode. Give Gallery2 the correct index. Change-Id: Ie0f3835f0a9ab46b408ffe0b4ea5dd60906267e0 CRs-Fixed: 816284
* | | Merge "SnapdragonCamera: Fix camera parameters concurrent modification."Linux Build Service Account2015-04-091-17/+30
|\ \ \
| * | | SnapdragonCamera: Fix camera parameters concurrent modification.Sai Kumar Sanagavarapu2015-04-081-17/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Parameters if updated from different threads will lead to concurrent modification exception in frameworks. To avoid this, use synchronize block whereever the parameters are being updated. Change-Id: I51dd27e1b4836ddef910224331551806ff66b24d
* / / SnapdragonCamera: [Smartfren] The Storage position should be SD card.likaid2015-04-081-0/+25
|/ / | | | | | | | | | | | | | | | | | | | | | | The app doesn't not eanble this funtion for setting SD card as the default storage postion in Smartfren. Check persist.env.camera.saveinsd overlay flag at Smartfren mode, when sdCard is writeable, set sdCard as default storage for the first time. Change-Id: Ia71e5d97a78da121a8bccfcd0032928a17566023 CRs-Fixed: 815639
* | Merge "SnapdragonCamera: Stop panorama capture when move to opposite direction"Linux Build Service Account2015-04-022-0/+23
|\ \
| * | SnapdragonCamera: Stop panorama capture when move to opposite directionlikaid2015-03-212-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | In panorama capture mode, when user moved to the opposite from the original direction, stop the capture and save current picture. Change-Id: I716a08f2fc497301fb8a6c6a124211b855cd9a77 CRs-Fixed: 801022
* | | Merge "SnapdragonCamera: Update the storage space status after remount SDcard"Linux Build Service Account2015-04-021-0/+20
|\ \ \
| * | | SnapdragonCamera: Update the storage space status after remount SDcardlikaid2015-03-201-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add broadcast receiver to monitor SDcard status, update the storage space and hint when the SDcard was mounted or unmounted. Change-Id: I4b114d42d26091588d745fee874c04d595d5cfa1 CRs-Fixed: 790983
* | | | Merge "SnapdragonCamera: Fix capture picture not to store"Linux Build Service Account2015-04-021-1/+2
|\ \ \ \
| * | | | SnapdragonCamera: Fix capture picture not to storelikaid2015-03-241-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enter gallery quickly after taking snap,the onPictureTaken in framework will not response which cause the picture can not be saved and make this bug happen. When judge the camera state is in the snap progress,not enter to gallery so that the picture can be saved. Change-Id: I79f74cdaf4c90ad71eb3f9b10a46027939fbffa7 CRs-Fixed: 811686
* | | | Merge "SnapdragonCamera: Avoid shutter button double clicked in short time"Linux Build Service Account2015-03-261-2/+8
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 16:00:24 +0000