summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge "Camera2: Synchronize access to camera parameters"Linux Build Service Account2014-02-041-25/+33
|\| | | | |
| * | | | | Camera2: Synchronize access to camera parametersSanthosh Kumar Thimmanna Bhattar2014-01-131-25/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Concurrent access between the main handler thread and the camera start-up thread w.r.t. 'mParameters' is possible. This change will synchronize the two threads in order to avoid any exceptions. ( cherrypicked from commit e988411c441410f270fe0b98dfd0d9b1f033503f ) Change-Id: I290452723b3687eba5240f451cc94aef175a9fc4 CRs-Fixed: 539634
* | | | | | Merge "Camera2: Check mCameradevice before setting skinToneEnhancement"Linux Build Service Account2014-02-041-1/+1
|\| | | | |
| * | | | | Camera2: Check mCameradevice before setting skinToneEnhancementSanthosh Kumar Thimmanna Bhattar2014-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Null pointer exception in app is observed when we open camera and immediately press home/back button. This is because mCameradevice will be null by the time handler thread gets a message to setskinToneEnhancement parameter. ( cherrypicked from commit 06fee777df529fa53ac5c5305e7324ad1baf085d ) Change-Id: I7f216a11a29b6b205be4c2d0ca8f1c346284c294 CRs-Fixed: 547522
* | | | | | Merge "Camera2: Fix concurrency issues with camera messages"Linux Build Service Account2014-02-041-4/+10
|\| | | | |
| * | | | | Camera2: Fix concurrency issues with camera messagesSanthosh Kumar Thimmanna Bhattar2014-01-131-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, multiple threads are trying to access same data and resulting in crash. ( cherrypicked from commit d11040c561e9add30768947aa93235ff08de03b1 ) Change-Id: Ib09950d6640afcd7962cba9ea5385d778f022abe CRs-Fixed: 542706
* | | | | | Merge "Camera2:stop recording from camcorder app in case of error"Linux Build Service Account2014-02-041-1/+1
|\| | | | |
| * | | | | Camera2:stop recording from camcorder app in case of errorSanthosh Kumar Thimmanna Bhattar2014-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes sure that stopvideoRecording is called for all error returns to the video recording app. ( cherrypicked from commit 9d65272083d0a78ca4adefbffc38f98b44cfa489 ) Change-Id: I88c4ac92f065e5008c16a7697a84301e1ff5e98f CRs-Fixed: 517351
* | | | | | Merge "Camera2: override Saturation&Contrast item when enable scence mode"Linux Build Service Account2014-02-041-5/+10
|\| | | | | | |_|/ / / |/| | | |
| * | | | Camera2: override Saturation&Contrast item when enable scence modeSanthosh Kumar Thimmanna Bhattar2014-01-131-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When HDR or any other scene mode is enabled, should disable the saturation and contrast items into gray. ( cherrypicked from commit aceeee3ef5812836265127ed784adb4ab5ed57fb ) Change-Id: Ia4e20e0ee2f80661c8b72bf81aeee6fa96dcdf1f CRs-Fixed: 526617
* | | | | Merge "Update settings pref values when BSM is not auto."Linux Build Service Account2014-01-301-4/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update settings pref values when BSM is not auto.Santhosh Kumar H E2014-01-161-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When BSM mode is set to a value other than auto, flash mode, white balance and few more settings will not be based on user preferred settings. So mParameter object will have default values. Updating those values in the list will over write the preferences. To preserve settings from preferences, we need to pass the same values. CRs-Fixed: 573584 Change-Id: Ic62dc537250468f189374fae9a897ee46d40e3a1
* | | | | Merge " Camera: Remove AF UI when faces are detected in photo ui"Linux Build Service Account2014-01-271-0/+7
|\ \ \ \ \
| * | | | | Camera: Remove AF UI when faces are detected in photo uiSanthosh Kumar Thimmanna Bhattar2014-01-061-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AF window does not go away when faces are detected while capturing the images.This is because AF is not cleared when faces are detected in photo ui. The fix is to clear AF window by calling AF succeed when faces are detected in photo ui. CRs-Fixed: 555139 Change-Id: If0f10296a8fa232829e80a07778f78f158a55bf5
* | | | | Merge "Camera: Dont reset camera state while capture is in progress."Linux Build Service Account2014-01-261-1/+10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Camera: Dont reset camera state while capture is in progress.Santhosh Kumar Thimmanna Bhattar2014-01-131-1/+10
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While capture is in progress and if we get autofocus event, currently we reset the camera state to IDLE blindly. This is resulting in app exception because it will trigger another takepicture and lower layers will return error. ( cherrypicked from commit 1bed537bb0848b6a1f64f9eb245b1c256999ebad ) Change-Id: Ia595dbad246759870371b749c0aa2def221560c5 CRs-Fixed: 550417
* | | | Merge "Camera2: Enable HDR for zsl mode"Linux Build Service Account2014-01-253-35/+1
|\ \ \ \
| * | | | Camera2: Enable HDR for zsl modeEvgeniy Borisov2014-01-083-35/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HDR is now supported for zsl mode Change-Id: Ic9985e9f2ca6ffea3f33aef1f6f2949d4876c8d9
* | | | | Merge "Camera2: Inverted preview in Panorama"Linux Build Service Account2014-01-201-5/+3
|\ \ \ \ \
| * | | | | Camera2: Inverted preview in PanoramaSuman Mukherjee2014-01-201-5/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For 8x26MTP device, panorama preview is coming as inverted. In present android version flippreview is itself taking care of rotation. This additional rotation is causing the inverted preview for the device where mount angle for sensor is more than 180degree. The logic related to mPanoAngle is not needed which had been added for previous android version. Change-Id: I6c5ed526382e0971e555a70946adb63a2acdf180 CRs-Fixed: 591767
* | | | | Merge "Camera: Change copy right year back to 2012"Linux Build Service Account2014-01-161-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Camera: Change copy right year back to 2012Vijay kumar Tumati2014-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this is 3rd party file, we shouldn't change copy right year. Reverting it back to 2012. Change-Id: If617e7607cd89b0270aabbe1186190dfe06fe40c
* | | | | Merge "Camera: Avoid preview restart after capture if possible"Linux Build Service Account2014-01-112-0/+26
|\ \ \ \ \
| * | | | | Camera: Avoid preview restart after capture if possibleEmilian Peev2013-12-182-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If the camera supports implicit preview restart after image capture, then this sequence will be skipped in order to improve KPI. Change-Id: I13b52255f1aa82805a67ad688a9964f84a447d5a
* | | | | | Merge "Camera2 : Reset mSnapshotInProgress if recording stopped."Linux Build Service Account2014-01-111-1/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Camera2 : Reset mSnapshotInProgress if recording stopped.Sai Kumar Sanagavarapu2014-01-081-1/+9
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If recording stops while snapshot is in progress, we might not get jpeg callback because cameraservice will disable picture related messages. Hence reset mSnapshotInProgress flag so that we can take liveshots in the next recording session. Change-Id: I6a639eb0b9444e4915786c65f64d3b95b064267c CRs-Fixed: 588698
* | | | | Merge "Camera: Don't do cancel_af till all CBs are received in burst shot"Linux Build Service Account2014-01-091-2/+3
|\ \ \ \ \
| * | | | | Camera: Don't do cancel_af till all CBs are received in burst shotVijay kumar Tumati2014-01-071-2/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing cancel_af in the first jpeg CB while burst shot is going on, is changing the camera state to IDLE and allowing next takePicture() which is resulting in crash as this call reaches HAL when camera is in picture taking state. Change-Id: Idd146060a73161bcc30c34756fb53662bb1f0902 CRs-Fixed: 593352
* | | | | Merge "Camera: Add support for 4K camcorder"Linux Build Service Account2014-01-091-3/+17
|\ \ \ \ \
| * | | | | Camera: Add support for 4K camcorderAzam Sadiq Pasha Kapatrala Syed2014-01-021-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case 4k is enabled, (a) set the preview resoultion same as video resolution. (b) set the preview format same as video format. Change-Id: Iebc4c7d47ddca6e03a72f3af7b4660e93c9a1b8e
* | | | | | Merge "Camcorder: Switch video torch when preview focused"Linux Build Service Account2014-01-091-1/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Camcorder: Switch video torch when preview focusedVladimir Petrov2014-01-061-1/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Currently, video torch switching is not determined properly. When user enables and disables flash mode checkbox, nothing happens. Also, if video torch is enabled and switching to Camera and back to Camcorder mode, torch doesn't lights up. - Adding a local variable mPreviewFocused to track the preview window focus state should fix the issue. Change-Id: Ia134b86885eda1ad50d510e67e5595a391326d10 CRs-fixed: 567295
* | | | | Merge "Camera2: Fix for unsupported resolutions by codec."Linux Build Service Account2013-12-291-8/+25
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Camera2: Fix for unsupported resolutions by codec.Sai Kumar Sanagavarapu2013-12-201-8/+25
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, logic for unsupported resolution for a codec is hardcoded and is limited to only H263 and 1280x720 resolution. Ideally, we should read capabilities of each codec from mediaprofiles.xml and check it against selected profile. Toast message is posted if any unsupported resolution is selected. Also skip setparameter call to HAL during recording, when orientation gets changed. Change-Id: Ife7dde725882d8217fadff7b56687cdad2c72ae4
* | | | Merge "Set original camera parameters while switching between modules."Linux Build Service Account2013-12-223-15/+1
|\ \ \ \
| * | | | Set original camera parameters while switching between modules.Santhosh Kumar H E2013-12-113-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera holder maintains a local variable to get original params and set those params back when user switch between modules. But these parameters were obtained from the instance of camera manager. So object in Camera holder will be a reference to an object in camera manager. Becasue of this all the parameters set in photo module are getting reflected in other modules. This change makes sure the camera holder's parameters object is created separately by getting data from camera device. Also reverted the alternative solution to reset scene mode in video and panorama module. CRs-Fixed: 579747 Change-Id: I02637fb2c215aeb1ba9076629400a339c31178ad
* | | | | Merge "Camera: Enable module switcher on resume"Linux Build Service Account2013-12-201-0/+3
|\ \ \ \ \
| * | | | | Camera: Enable module switcher on resumeSuman Mukherjee2013-12-171-0/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For HDR mode, on pressing shutter key, module switcher icon will be turned off. That'll not be activated if user relaunch camera after pressing home key in HDR mode while capturing image. Enable switcher in UI on resuming camera module. Change-Id: I094f4941f87149e4c5b2393881ed5175c4388559 CRs-fixed: 580450
* | | | | Merge "Camera: Avoid animating cature with decoded jpeg in long shot"Linux Build Service Account2013-12-201-1/+3
|\ \ \ \ \
| * | | | | Camera: Avoid animating cature with decoded jpeg in long shotVijay kumar Tumati2013-12-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decoding full jpeg image and animating capture with that is causing lot of delays which effects long shot stability.This change avoids that. CRs-Fixed: 586568 Change-Id: I0133cc55e5efcc801dd9a98c289dec965aa35984
* | | | | | Merge "Camera: Add support for UbiFocus, ChromaFlash and OptiZoom."Linux Build Service Account2013-12-206-1/+138
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Camera: Add support for UbiFocus, ChromaFlash and OptiZoom.Ajit Singh Solanki2013-12-136-1/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add UI option in App to enable/disable UbiFocus, ChromaFlash and OptiZoom - App shows UI options for these features only when supported in HAL Change-Id: I924f97b2b510b351d9a8cb48a0aac6a4dc24ca10
* | | | | | Merge "Camera: Set the width dynamic to parent from fixed 400px"Linux Build Service Account2013-12-161-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Camera: Set the width dynamic to parent from fixed 400pxSuman Mukherjee2013-12-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Width of the seekbar was 400px and that caused overflow for the rightmost text value. Set the width match_parent so that it'll change dynmaically with the text window. Change-Id: I51069d4c5687e72516bc4a5afc59f9f3ae6f8e88 CRs-fixed: 582325
* | | | | | Merge "Camera: Overrides the focus mode for ZSL"Linux Build Service Account2013-12-133-2/+39
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Camera: Overrides the focus mode for ZSLEmilian Peev2013-12-133-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This modification will override the currently configured focus mode to CAF( if supported ) in case we switch to ZSL mode. In addition to that the client will not be able to change the focus mode once ZSL is active. - TouchAF will be available in ZSL mode if supported. - Moves focus option to the rest of the 3A modes. Change-Id: I4a2ab7d6013c26365cf46e7b3c5d2d0d3afd574e CRs-fixed: 522500,528835,585670
* | | | | | Merge "Merge commit 'android-4.4.2_r1' into merge_branch"Linux Build Service Account2013-12-121-2/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge commit 'android-4.4.2_r1' into merge_branchShruthi Krishna2013-12-111-2/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'android-4.4.2_r1': Reduce logging of flattened Preferences
| | * | | | | Reduce logging of flattened PreferencesSeth Raphael2013-12-031-2/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11901390 Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
* | | | | | Merge "Aspect ratio correction for landscape mode."Linux Build Service Account2013-12-121-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |