summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Camera2: Adds support for longshot/burst mode"Linux Build Service Account2013-11-079-8/+196
|\
| * Camera2: Adds support for longshot/burst modeAlok Kediya2013-11-079-8/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | Merge "Clear preview frame on surfaceTexture during activity pause."Linux Build Service Account2013-11-072-0/+16
|\ \ | |/ |/|
| * Clear preview frame on surfaceTexture during activity pause.Suman Mukherjee2013-11-062-0/+16
|/ | | | | | | | | | | | | | CameraActivity Reloads views on filmstrip during each resume. While reloading surface texture is destroyed and recreated. So when user press power key to pause and unlock to resume, till the surface texture is destroyed user see the old frame (which was rendered before onPause). Followed by gray screen till surface creation and start of preview. It created filckering impact on UI. Fix here is to destroy the surfaceTexure in onPause itself so during next resume user won't see old frame. Change-Id: Id5c787586288de660dc6ad91f3c2ae018761ddd4 CRs-Fixed: 566255
* Remove unnecessary files.Satish Kamuju2013-11-012-0/+0
| | | | | | Cleaned up swap files from this project. Change-Id: I056e69c20f97208b5c4be27c9f8bbb157e408278
* Camera2: Fix compilation issuesManish Kumar2013-10-317-73/+131
| | | | | | | | Fix compilation issues Change-Id: I77317b64eb11663dadff6a0b46e08e49d9e8ab21 (cherry picked from commit 53fa3ae8cd74ce42810f6d638bb7efe15fd01ba4) (cherry picked from commit 4151656344e66f7f43f017ab33ff42a33e6df552)
* Camera: Synchronising video functionality of errant usecase.Ashok Raj Deenadayalan2013-10-311-1/+46
| | | | | | | | | | | | | | | | | | When user switches to VideoModule and executes the capture, stops it immediately, after several such attempts the media recorder enters into illegal state, in such situation, if user still continues the same behaviour, app will be flooded with the onShutter events which will lead to ANR, and further similar trials will lead to crash. Here, we are synchronizing the behaviour(user events)by checking the entry/exit body of majorly hit functions so that app will not be flooded with user events. (cherrypicked from: I3e7768211855a31f1c573d0ed89abb5c6216cb1b) Change-Id: Ia65f39c24822ae09694b8247fa58ffb1770e74da CRs-fixed: 534762 (cherry picked from commit 615b8451f787aa8e34834847301fd151d7eb66d6) (cherry picked from commit cf6dfaf3aa65b46b74f3e54236b24638ad1249de)
* Set params to camera in active preview on orientation change..Ashok Raj Deenadayalan2013-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | --On a race condition same surface texture is getting used in startPreview and onOrientationChanged by Handler Thread and CameraThread. Synchronised Lock object is going to wait state and that caused ANR. --Set orientation related parameters only in preview state (cherrypicked from: I8d149e839872c06efa696a10fa3ac19618791f41) Change-Id: Id2be51f58315d2d2effe62e22955b203187e5fd7 CRs-Fixed: 538723 Conflicts: src/com/android/camera/VideoModule.java Conflicts: src/com/android/camera/VideoModule.java (cherry picked from commit 194f1aea7d6f88de55d54b750c3be4c6957e0820) (cherry picked from commit 042c6222edf077251e3b0ef52a23d3b433bc804d)
* CameraApp: Updating the view for new list item preferenceAshok Raj Deenadayalan2013-10-311-5/+6
| | | | | | | | | | | | | | | | | | | | | User has launched the popup menu view in portait mode and can see all the list items in a single view. When user turns the device to landscape mode, the popup view will be shown partially, thus user has to scroll the popup menu to see remaining list items. When user scroll's over the view, if the view is not updated/ initialized with the new list item, it will render the old indexed item(s), thus user will see the repeatation of old items. This fix will update the view by initializing the item preference from the adapter and returns the updated view based on new position. CRs-fixed: 524897 (cherrypicked from: I9ae25f0a711bc641fa405e85292db2c1af95e8a1) Change-Id: I7cc63c9e01a69b6c439102a93f964013f1e15374 (cherry picked from commit d69c568eb8bf9a9a5cce6c9402617f9e6f3072a8) (cherry picked from commit 3851a9b18310580ef9f6ccecdfb1c3ca08a6c719)
* Camera: Disable skin tone bar during switch camera...SanthoshHE2013-10-311-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 08dcf9cda27328dffab9921b42cb13b6f8d5a770 Reverted the above commit because updating skintone seek bar all the time caused issues during regression. The original issue is fixed in a way that skin tone bar is dismissed in switch camera function (where other UI controls are dismissed). Hence after opening new camera device depending on the scene mode setting, skin tone bar visibility will be set for the new camera. (cherry picked from commit I61602dca23c59b6715d1e887d0199d8885330521) Change-Id: If7a37b9dbb3d379f079e88ecf8e930ad1f7b82ab CRs-Fixed: 537663 Conflicts: src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoModule.java (cherry picked from commit 63f9d74c3abe9d0a9c5cba877665c3349554c024) (cherry picked from commit 1640e0c12135b0b2a0b7b2440d8eaeb7f5ffe8c8)
* Camera: Configure skin tone in main handler thread..Santhosh Kumar H E2013-10-312-28/+22
| | | | | | | | | | | | | | | | | | - A "ConcurrentModificationException" is possibleduring concurrent configuration of camera parameterswhen skin tone is updated. To avoid this skin tone is applied through the main handler. (cherry picked from commit I2176e615432b1a25ff439b3f105ea9e498ae8803) Change-Id: If20c34dc70fbf6fa3fc9ddfefadd71bc9db2cffb Conflicts: src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoModule.java (cherry picked from commit 37c435a3b61b435ab677cc013af02c8b48d76dc9) (cherry picked from commit 5341b096004fa59d9732651fe03ffc161bc61156)
* Bring skin tone seekbar to front...Santhosh Kumar H E2013-10-312-3/+48
| | | | | | | | | | | | | | | | | | | Skin tone dialog was part of frame layout and render overlay was drawn on top of this. So render overlay was consuming all touch events. This change makes sure skin tone dialog receive touch events whenever it is visible. Change-Id: I1d01bcc101c2f9090f0f163397e86553f98b49ac Conflicts: res/layout/photo_module.xml src/com/android/camera/PhotoModule.java Conflicts: res/layout/photo_module.xml src/com/android/camera/PhotoModule.java (cherry picked from commit 675a15daf9b9eef543386630dc65f3fa9dac498e) (cherry picked from commit ac2d0ab2b068576bf1adf05e4cef96aaf4c14be3)
* Bring count down timer UI to front.Santhosh Kumar H E2013-10-311-0/+1
| | | | | | | | | After inflating count down timer UI it was not visible on top of the preview. This fix will bring it to forground. Change-Id: I3fd5cf75fdd9dc63776fa68668f3b6fddf2db1f7 (cherry picked from commit 48226bb2faf6377a5af91db82ffb86848a7600bf) (cherry picked from commit c88dcd24d06a3af1de4ec18914fbb03a5678bff2)
* Camera: Fix for stretched preview in camera and camcorder...Santhosh Kumar H E2013-10-316-44/+167
| | | | | | | | | | | | | | | | | | | | Stretched preview is observed in front camera due to sensor's mount angle. So resizing the preview by considering aspect ratio of the preview. (cherry picked from commit Ie8a9e062782aa6caaa80ddab705c937da6b0761e) Change-Id: I0bca9076a6dffa4c4972e6d5d0939c57569615bd Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java (cherry picked from commit 2960ef94825458dc07a497d4414155b57ae620d7) (cherry picked from commit d2fbed622a486151a656261d0dd56c896f0cc700)
* Camera : Fix null preference string for scene mode and fd.Sai Kumar Sanagavarapu2013-10-311-4/+4
| | | | | | | | | | Null pointer exception in app is observed when the preference string for scene mode is dereferenced.for YUV Sensor, preference setting for scene mode is NULL as its not applicable for YUV sensor. Change-Id: Icc04e9b21641b1cc3ca7e183a23667be151b5a65 (cherry picked from commit 56dd2afdd7ad89e85d06450175538dbd3f075e8c) (cherry picked from commit 040389fdf54389745b19a61f40732f54a8ce7344)
* Camera: Add histogram view to preview framelayoutSanthosh Kumar H E2013-10-312-13/+6
| | | | | | | | | | | Swipe in preview does not route user to Gallery, hence no need to handle this operation. Histogram graph view was added outside of preview frame layout and there was no container view outside this. So histogram was occupying complete screen. Change-Id: I94c9e7e76f4bc5d1efb568280ca5c41585224ff9 (cherry picked from commit ad3ece51bf6e3b14c2a5a068ce937b89b4578e24) (cherry picked from commit 348a7d8a67f06f3b6fbd999bc0b3ef81a364b5c1)
* camera: Invoke camera UI functions only after initialization.Alok Kediya2013-10-312-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | When switching from Panorama mode to Camera mode, the CameraActivity invokes two functions openModule and onOrientationChanged. openModule initializes PhotoModule. As part of the PhotoModule initialization, the PhotoUI and PhotoMenu are initialized. But this is acheived by posting a message to the handler. When the message is read by the Handler, the PhotoUI's onCameraOpen is invoked which initializes the PhotoMenu. But sometimes before this message is read by the Handler, the onOrientationChanged is invoked, which invokes couple of functions from PhotoUI class acting on the PhotoMenu. But since the PhotoMenu is still not initialized, it throws up error in the form of NullPointerExceptions. Fix this by checking if the PhotoUI and PhotoMenu have been initialized. If they have not yet been initialized, send a message to the Handler to invoke these PhotoUI functionalities after the PhotoUI has been initialized completely. (cherrypicked from commit 774659c9f580b90a15a896881376075bb1506a05 ) Change-Id: Idb55e4f5ba29523c273ff66f11149ff271c490a4 (cherry picked from commit 42f1ffca2e43c4561f5bc3534a966c4bbe6cbef8) (cherry picked from commit 8df298b693932da2c06dbfd40ad5bbe57dc96308)
* Camera: Remember the current Touch AF/AEC selection.Alok Kediya2013-10-311-1/+3
| | | | | | | | | | | | | | | | | When user switches between scene mode Auto to non-Auto, the touch AF/AEC option is overridden from the UI and the lower layers intimated to turn off Touch AF/AEC. However when we switch back to scene mode Auto, the Touch AF/AEC is turned off although user might have turned it ON before switching to a non-auto scene mode. We need to remember the user selection and restore back to that when user comes back to the auto scene mode. (cherrypicked from commit 9ff79cf9291dde975a2607adb6ff97d2dc1b0c17 ) Change-Id: I5f306445bc96a52c0f921d75e7a3b6e944bc7858 (cherry picked from commit 913c1bfd3465dc101a3c6ec3271588d895fc82b4) (cherry picked from commit 63a0c7bcc9abb980a5813c76545b4a4d6acc1ec2)
* Camera: Gray out unsupported options when scene mode is not set to AutoAlok Kediya2013-10-311-0/+17
| | | | | | | | | | | | | When scene mode is set to a value other than Auto, camera application is querying for the focus, autoExposure, flash, white balance, exposure values. Framework is returning the values which user had set irrespective of whether they are supported or not. And also there was no check during the initalization of the settings dialogs. This change will enable the above settings only if scene mode is set to auto. Change-Id: I1e4e84c405c5d163ac352854d3a847bba63831c9 (cherry picked from commit 4cbc5da11bd9e378c5e82d31688aa0e8917ae483) (cherry picked from commit b07c51a67b576bc564a8073ca0f7f5d5e2ee7ef8)
* Camera: set default focus and metering areas to null.Alok Kediya2013-10-311-7/+4
| | | | | | | | | | | | | | Earlier, default values were not null which is not compatiable with our HAL. (cherry picked from commit d45720bbf03b699f9afd5909fedd82ee5a2e9745 ) Change-Id: Icfbd06ecfbf55acd1502a7d395a9239c9c9c2b1a Conflicts: src/com/android/camera/FocusOverlayManager.java (cherry picked from commit 98b3c247b8bd03b16d3b6f4b147425cad31684f7) (cherry picked from commit d3c5da81208bd01265950b31ef670bf153d0bdf8)
* Camera: Add support for setting DISAlok Kediya2013-10-314-1/+36
| | | | | | | | | | | | | | | - This patch allows the CamCorder client to configure DIS from the UI menu. Supported modes by the camera are parsed and dynamically filtered. (cherry picked from commit 24513b0af17e514aa24100c908432c115a1ddcda) Change-Id: I7aaacc883eec9d1b91f549d8e76d96f4a6940aed Conflicts: src/com/android/camera/CameraSettings.java (cherry picked from commit 1278c225500065e8448ad0ea2c6f50abefc5e884) (cherry picked from commit e093b0988c3c4b5ece6ea7ad5f79796705cd4b21)
* Camera: Some of the options in the Camera settings are getting selected only ↵Alok Kediya2013-10-311-11/+21
| | | | | | | | | | | | | when we tap on it twice We are maintaining the popup dialog level in a variable and based on that top level popup is dismissed and the previous popup will be displayed. (cherrypicked from commit 6b8a6e50b48432572ce80ca753b3fe1bab87191a) Change-Id: I6876c5663047eb0d3ec1ce64af6182be0b5bd79c (cherry picked from commit f147ea11ff0b993f8aa5e335065c88051341ab8d) (cherry picked from commit 591973b04ca5444bc644e1ad1f02ea0b5b237d86)
* Camera: Support stream based flipAlok Kediya2013-10-314-3/+131
| | | | | | | | | | | | | | | | | | | Flip operation needs to be done per stream. App will read from system property about stream based flipping setting and set corresponding parameters to let camera hardware to apply flipping setting per stream. To keep app behavior persistent when flip and rotation are enabled, need to take case H/V flip when 90 or 270 rotation happens. Need to reverse H/V flip to acheive same output no matter device is in portait or landscape mode. (cherrypicked from commit b38b8246204871082dc7ac6f5e626d6162d2be70) Change-Id: Ia06060709162237dece1a05a3ae58429a0c99b06 Conflicts: src/com/android/camera/util/CameraUtil.java (cherry picked from commit b6aff328cdd99fb0db11c989a72f5eafd7d82324) (cherry picked from commit 29888be992b8955f88a2f89ffd407733d771c1e6)
* Camera: Filters supported power modesAlok Kediya2013-10-311-0/+4
| | | | | | | | | | | | - This change will remove the power modes options if they are not supported by the camera. (cherrypicked from commit ec3b6263dbded2f2f98bd5bfb5f83e03fda69e66) Change-Id: I594b28129be8c21c032b957bed3a5d89dedb98d1 (cherry picked from commit eba81192e47cd0d87edeca9035b42f2ee47e0b36) (cherry picked from commit 41df1aaabf96df8b705f109f2ca6eb692cbb6768)
* Camera: Fix issue with dialog box in camera settingsAlok Kediya2013-10-312-13/+21
| | | | | | | | | | | | Dialog box is not getting closed even after clicking on "done" button in camera and camcorder settings. This change fixes this issue. (cherrypicked from commit b9f6f18ba263bb36a0bf03cfafb8b91a659cb2e5) Change-Id: Icf5afbb399e5abf93d19a9112200d507355662e6 (cherry picked from commit 2408d38f98dd692b972ec25d10a11bd0d6c15747) (cherry picked from commit e82ce8f4cb6ecd3e702087b4989832dd8a265601)
* Camera: Add support for raw snapshotAlok Kediya2013-10-317-27/+75
| | | | | | | | | | | | | Previously picture format only have option for jpeg and raw, but detailed raw image format is misssing from menu to choose. Also, changes to save raw image to coorect path are included. (cherrypicked from commit c0028f9dbe178c3fed1bcb4af96eb0db4d2e2973) Change-Id: Ifab7fd80e4a83370b2dc6932340005a06cc3552f (cherry picked from commit 27f9245f35d0284c17d8d2fdf5576ea3879e7d33) (cherry picked from commit 3c66703af119c06697f16303fadadbe956646cb3)
* Camera: Enable Burst snapshot in ZSL mode..Alok Kediya2013-10-311-2/+29
| | | | | | | | | | | | | | | | | | | Add support for burst snapshot in ZSL usecase. Modify the JPEG picture callback to change focus states only after all the snapshots are received. Also generate new image names for the burst snapshots taken using single capture command. (cherry picked from commit 88bd49c06bde108930fa851b8750a35fe225dd38) Change-Id: I402a3ecc888096a7188f16ee2ace0fcb7752e8e3 Conflicts: src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoModule.java (cherry picked from commit 3e325e74fb8b163f1fcf6913d0ee986ce43426c8) (cherry picked from commit 22e4c200bb10db52abc9a889bdb2020fa0f794b8)
* Camera: Adds support for Face Recognition enableAlok Kediya2013-10-313-0/+28
| | | | | | | | | | | | | - This change enables the camera client to configure the face recognition feature depending on the camera support of the lower layers. (cherrypicked from commit 9d469e2a66859fe5070d9651a41d0ca330ccc8cb) Change-Id: I141632e27cbef3bb53ea06a249491eff78b5f13b (cherry picked from commit b420162dd9c1f974628e8e7ff83bc0909c59e272) (cherry picked from commit 9c258ff94e7ce18c7e4072b83203092bd3d4c0d1)
* Camera: Add support for setting AE Bracketing.Alok Kediya2013-10-314-5/+47
| | | | | | | | | | | | | | | | | | | - This modification re-enables the AE bracketing UI option and adds the necessary logic for parsing and filtering the supported AE bracketing modes by the camera. (cherrypicked from commit 0b2b18f2a6b89da004db8c36420fc61f0e884290) Change-Id: I5aea466eed9a3de4a899cced1e03c5177e57104b Conflicts: src/com/android/camera/CameraSettings.java Conflicts: src/com/android/camera/CameraSettings.java (cherry picked from commit 8cd8e6797ed3ce856bb4d7771085e1678bea7f25) (cherry picked from commit 24b84fd5855235b8710a625e42a0f2879cc1d898)
* Camera: Video HDR Feature IntegrationAlok Kediya2013-10-314-0/+24
| | | | | | | | | | Add Video HDR support on UI. (cherrypicked from commit 423f0e277390cd4cbb87c89d063820ad0a953631) Change-Id: I14d2a7002fbaa4859ceb19317490e8843786ce35 (cherry picked from commit b2afb0f26563599e65564dea9605c7bc7d8aa29c) (cherry picked from commit a31228372a155dc1c02c7fb0669ea350c55c661d)
* Camera : Enable camera and camcorder UI features..Alok Kediya2013-10-3113-167/+1460
| | | | | | | | | | | | | | | | | | | | 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)
* CameraApp: Updating zoom value from camera device parameters.Alok Kediya2013-10-312-0/+4
| | | | | | | | | | | | | | | | When user switches from one camera to other the zoom values were stored in a class variable. Due to which the application was using the same zoom value for different preview size cameras. And which was making the app to apply same zoom value for two different sizes while rendering. This change will enable the app to use different zoom values for different preview sizes. (cherry picked from commit cf97ea085c2258173f13c757d20eaffcafe23de9) Change-Id: I1cd0994b4b4ebc8eba931f4b05512871897bf8c6 (cherry picked from commit 6fa132eca1ff1872e3fee8e842b570d30c55c78e) (cherry picked from commit 8c4cdf02fd57f4a008f01ed0e97bcf4b3c8d88cd) (cherry picked from commit e2ddc26ba302add0d8e10121927bc8f35e89795b)
* Camera: Menu & zoom options are overlapping in front camera.Alok Kediya2013-10-312-0/+8
| | | | | | | | | | | | | | When user presses the menuoptions the popup is displayed and UI will have the controll over it, again when zoom is triggered the zoom renderer was not hiding the menu popup. This change will synchronise both listeners mentioned above. (cherrypicked from commit 713847197c35409f0f198903f6b3dd3c39296848 ) Change-Id: Ic4509fe4473070c73dba377c5fdc3f224af71ee0 (cherry picked from commit 6c464f1402110b1f0f9790d5a9479dc3031d04eb) (cherry picked from commit 4fe74b8ad31a6d43c179e0181813ba3bf4c58feb) (cherry picked from commit e525f04730668369f76afb41870199eaad0b9375)
* Camera: Fix panorama preview/snapshot rotation issueAlok Kediya2013-10-311-11/+8
| | | | | | | | | | | | | Remove earlier hardcode and use unified solution to solve Panorama preview and snapshot rotation issue by using sensor mount angle and angle compensation in panorama postprocessing. (cherrypicked from commit a585a576a3259477a460e367fe4af69a448a2d25 ) Change-Id: Ie7130a0670174d5957b871b76b05a0bfdd9d4d27 (cherry picked from commit 21a26f3ffe023ee550a51a547e46c75c3dd914a6) (cherry picked from commit 50aebc4f3fbdf6f07a4b87cc87eef7e30257a05b) (cherry picked from commit e5fb76066ab7b5d1f82beb16a3fb8c4e5c031671)
* Camera: fix panorama rotation issues.Alok Kediya2013-10-311-2/+11
| | | | | | | | | | | | | preview and snapshot are rotated unexpectedly. Need to change rotation angles in panorama based on sensor mount angle. (cherrypicked from commit e80845863aa453eb85cbf7f01af32b9c0c0b874a) Change-Id: I09d3111c3513141bffc649349a55d36a79818124 (cherry picked from commit 85ce7ba402fe354784505a8d6939700706e4401b) (cherry picked from commit be1768dfed2acedb34a3f393304999df3d4cabfb) (cherry picked from commit 790aeae0ed544e10ede5ccd7636eb4cf08a1d979)
* Camera: Fix the countdown timer values updated on UI.Alok Kediya2013-10-311-1/+2
| | | | | | | | | | | | | | | | The count down timer values shown on the UI are not reflecting the values actually selected. For eg: If user selects 6 seconds, the value selected is 10 seconds. This is because the code populating the UI is not picking up the expected duration value. Fix this by showing the correct duration value on the UI. (cherry picked from commit 2856dcfb239a33c8f9d2051b3549190c17a666d9 ) Change-Id: I6a3fed525b373ce3d415b95dc7a4b6336210bd15 (cherry picked from commit d08a0c0f4a06d6f700a019a0ecd77b918015c798) (cherry picked from commit 4d582e49339beb9502b381c129f0942be0e044ea) (cherry picked from commit a6855eae463be00da29532c35334bdc3b163f77d)
* Camera: Propagate power mode selection from UI to lower layers.Alok Kediya2013-10-311-1/+13
| | | | | | | | | | | | | Send the power mode(low power/normal power mode) selection from the UI layer to lower layers, such that the camcorder topology is setup in accordance with the power mode selection. (cherry picked from commit 7243d4392808d32e7d729d6976078c8f6a82c8fa) Change-Id: Ia36e9c01a871ccd35f68f54d815f642792fd68b9 (cherry picked from commit 60ef6c5aadbb6a0b0717c2521cd51143da13679b) (cherry picked from commit e73a3ff6465bdbfd8edf62a8d259590bd94b7453) (cherry picked from commit 75551bc48481c6c5864645ef74b0059bb569e692)
* camera: change for zsl and hdr incompatibleAlok Kediya2013-10-311-0/+5
| | | | | | | | | | | | Camera will crash when capture in zsl and hdr mode sametime, change to fix this issue through enabling one mode will disable the other one. (cherry picked from commit 4e4301d6cd56e710d1d628be23bcb1477759fd9b) Change-Id: I1a9ceaa9698c01246e98284e25ff34c50bf5fc74 (cherry picked from commit f208f2709eb452fc956b5ee8349d41b09f8d2837) (cherry picked from commit 4f7013911538ba244a1333d301ce5388a6f60769) (cherry picked from commit 0917909d7fc6fc3a2084a5cdafea68d1c2d0bc82)
* Camcorder: Set audio code in profile based on hfr and time lapse settings.Alok Kediya2013-10-311-1/+5
| | | | | | | | | | | | Set audio codec in media profile only when time lapse is not set and hfr is set to Off mode. (cherry picked from commit f0a631472983c59e0fe936bffacc2fde763517f6 ) Change-Id: Id4ce04793b0968a18ec9c3ee3c71f77c7d0a4d34 (cherry picked from commit 47eec26bb58c977dceb07497c590f7dabf0417e6) (cherry picked from commit aa4e7a3a4da9e46aee154a4152f2b93be888a9da) (cherry picked from commit b7667e7e853248f516bb2edbc01f8c5cb7e5a7ab)
* Camera: Use default value in case new value is not supportedAlok Kediya2013-10-311-1/+3
| | | | | | | | | | | | | | | | | | | | | - Instead of throwing exception in case of new value is not supported, just use the default one - The scenario for fixed issue is: 1. Start back camera 2. Select some scene mode that doesn't overwrite focus mode 3. Go to video mode 4. Switch to front camera (focus mode is change to continuous video automatically, based on supported values) 5. Switch to back camera (focus mode is still video) 6. Switch to image mode (focus mode continuous is still selected, but not supported for image) (cherry picked from 3d5393822990a36e6723657ab7807d1aa15f5fb9 ) Change-Id: I0512cb1db6c6fdda826d88a22642bff911b68d2d (cherry picked from commit b70466eba25662171f209164392489ab147ac5f9) (cherry picked from commit f871072244ce7d429266ff916319361cbfb6b837) (cherry picked from commit 63fd837bf89903e2e9e472ba4aa56bdd584020b2)
* Camera:Define KPI wordsAlok Kediya2013-10-311-1/+1
| | | | | | | | | KPI words are defined for Shutterlag. Change-Id: I544b3b7050f724cf915e2625bea1fb53c7ca9258 (cherry picked from commit 14124588b6e98167153578174d0ed9d9d341dfa7) (cherry picked from commit 644a7e8e6d5b3a7c7b569d2aa368fdc23468d57f) (cherry picked from commit 66138a1bf4923a47943ac8e01ca24acbb89feda6)
* Camera:Avoid recording for unsupported format in HFR.Alok Kediya2013-10-311-0/+12
| | | | | | | | | | | | | | -There is no condition in Camera VideoModule.java to check if unsupported resolution or codec is set for HFR. -Check is added and displayed toast message for Unsupported resolution or codec. (cherrypicked from commit 299c6c7f4ad266509abb6031986849495bdf0830) Change-Id: I22a81e2be466353a8b141bb9b84bb95d063fa98b (cherry picked from commit 39a199b6fce45de26636b9161376c6af1dccc1bc) (cherry picked from commit 31d99e7881138f184c48e6305abbef141291ff6c) (cherry picked from commit 11563cb78844db0202b11e0aa36e14a48f8954ef)
* Camera: Make HDR off in UI when ZSL is onAlok Kediya2013-10-311-0/+13
| | | | | | | | | | - Make HDR off in UI when ZSL is on (cherrypicked from commit 9f00bc61e0fda6caa4d5bc7ed41329c4389145c3 ) Change-Id: Iabc668ab2b276f3eec81a4a454d1ba2213e84cea (cherry picked from commit 8e3b4e324211829c95b125290d278d317b49faa1) (cherry picked from commit 1107a9e7733e425efe08fcc181f59002eb8b43cd) (cherry picked from commit f14f055a429a136dfb0ecb1f0719e21c71c327cd)
* Camera: Shutdown the camera in case of UNKNOWN_ERROR.Alok Kediya2013-10-311-1/+2
| | | | | | | | | | | | | | Currently the camera application shuts down the camera only in case of SERVER_DIED error. But if the camera driver goes into a bad state, it just sends a UNKNOWN_ERROR. So shutdown the camera even in UNKNOWN_ERROR case. (cherrypicked from commit 432da3d40184abbffc0ca75fa10cb20e76520bdb ) Change-Id: I5d9329538646dad30eacd30b3cfa3bfd6769b600 (cherry picked from commit 14b02e245490c780fca5952a4d5b84f99225c0e6) (cherry picked from commit a1f653ce704efc7110b00e8ee7d56a954be6eb23) (cherry picked from commit 7b6c06353bf26a0a7b3c50ebeb8337d05e471a11)
* Camera: Fix for the AF brackets issues in Face Detetcion.Alok Kediya2013-10-311-1/+0
| | | | | | | | | | Also disable the FD start flag from stopPreview. (cherrypicked from commit 2ae27a714a9f0e4d2369f3d080d41982f76c8e2f) Change-Id: Ic6fe9d119633627b94f3635d59eedd87db1709c9 (cherry picked from commit 14c156cc70ac1a181539102fd899a24858589422) (cherry picked from commit 2e7cb29544fc26de520762aea4cd6d8dc2749639) (cherry picked from commit 98b6affb83eb092a25e294b6447d49f6c048cea2)
* Camera: Fix for focus mode option missing in camera settingsAlok Kediya2013-10-312-5/+4
| | | | | | | | | | | Also add "Normal" and "CAF" options under focus mode settings (cherrypicked from commit ce394a31d3ad72228861322ff8cf82e494ddf358) Change-Id: Id9168d43d92adf3e209896b2501f28d4a0f0293c (cherry picked from commit c207527c898023862063dac98e60da0490af27f1) (cherry picked from commit 631d0f1abe7447915bd6fd75308d523d7a734cfb) (cherry picked from commit 8ccaca55d0b6cd75321ab26f2781ae6f8c737270)
* CameraApp: Histogram disabled in ZSL after captureAlok Kediya2013-10-311-0/+10
| | | | | | | | | | | | Histogram is disabled after every capture and enabled during preview. For ZSL mode, histogram is not disabled after capture. (cherry picked from commit cb58b0e64c05eb0c0173aa198e2836fc6a7467a0) Change-Id: Ibf32cb56d0b1c11b321f7a36e4c53f5d036ff671 (cherry picked from commit 91edd2cf79da7dbd21175ed1331c6655529c4e5b) (cherry picked from commit 6f2344ba8dda48557f05302ec6b689e4123dcaf8) (cherry picked from commit 9add261e83cbb2b74cb0ab67115886eec321b0b9)
* Camera: Add initial QCom value add features.Alok Kediya2013-10-3111-25/+1489
| | | | | | | | | | | | | | | - Enhance the camera picture size table by adding more number of supported resolutions. - Enhance the camcorder menu by adding support for additional video and audio codecs. - Also provide option to select the duration of the recording clip. (cherry picked from commit 7a5402332f3b527767b85c1fc112880d02a47c0e) Change-Id: I553d4eb74337701bc57d069c8374646a7e15c2d5 (cherry picked from commit cdffd7510e1f9a236e43438f035bc5be9e3c0c17) (cherry picked from commit 93c32e9e069d7c48b71fbbe45cae59a54df443ec) (cherry picked from commit f6b24346ab9d28953a5697924d6815ed2c006cf3)
* The initial focus value should be true.ztenghui2013-10-221-1/+1
| | | | | | | | Every time when we enter the wide angel (SRI) module, the preview should be in focus. bug:11234723 Change-Id: I218573946609f1e0e4415621a71b96a20775237d
* Don't crash when preview surface could not be set.Sascha Haeberling2013-10-211-1/+1
| | | | | | Bug: 11021188 Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 21:26:17 +0000