summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API focus ↵Sol Boucher2014-08-231-3/+10
|\ | | | | | | | | | | | | modes" into lmp-dev * commit 'd6a52ce7b43f15fc931038133b4fea821e9f3b9f': camera2-api: Work around invalid camera2 API focus modes
| * Merge "camera2-api: Work around invalid camera2 API focus modes" into lmp-devSol Boucher2014-08-231-3/+10
| |\
| | * camera2-api: Work around invalid camera2 API focus modesSol Boucher2014-08-221-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | The validation routine now changes the focus mode to FIXED if the requested one is unsupported. This is to work around devices whose templates erroneously specify unsupported focus modes. Bug: 17177436 Change-Id: If9b679510e0c232453dd0a77dbdd2e0ec713ac12
* | | resolved conflicts for merge of 1870c071 to lmp-dev-plus-aospStephen Hines2014-08-220-0/+0
|\ \ \ | |/ / |/| | | | | Change-Id: I4daede2c850ef9c58980c9191c2a8b837e427171
| * | Merge "Remove deprecated carousel from frameworks/ex."Stephen Hines2014-08-2291-6997/+0
| |\ \
| | * | Remove deprecated carousel from frameworks/ex.Stephen Hines2014-08-2291-6997/+0
| |/ / | | | | | | | | | | | | | | | Bug: 16031597 Change-Id: Ifa547cdfde19f67a3c85d39c1d50ae317bca5932 (cherry picked from commit 3852987b90d58528cb9b9e11d54db4dd7ad9df0d)
* | | Merge "camera2-portability: Play shutter sound for camera2 captures" into ↵Sol Boucher2014-08-221-1/+5
|\ \ \ | |_|/ |/| | | | | lmp-dev
| * | camera2-portability: Play shutter sound for camera2 capturesSol Boucher2014-08-221-1/+5
| | | | | | | | | | | | | | | Bug: 17109582 Change-Id: I73321cdbb2972b2d1e9bc2de93192fbb506347e7
* | | Merge "Remove deprecated carousel from frameworks/ex." into lmp-devStephen Hines2014-08-21116-7666/+0
|\ \ \ | |/ / |/| |
| * | Remove deprecated carousel from frameworks/ex.Stephen Hines2014-08-20116-7666/+0
| | | | | | | | | | | | | | | Bug: 16031597 Change-Id: Ifa547cdfde19f67a3c85d39c1d50ae317bca5932
* | | Merge "Add exception logging to CameraDeviceInfo retrieval failure" into lmp-devAlan Newberger2014-08-161-0/+1
|\ \ \
| * | | Add exception logging to CameraDeviceInfo retrieval failureAlan Newberger2014-08-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | camera1 CameraAgent returns null CameraDeviceInfo if the underlying camera device is broken. see b/16982203, this caused issues but was invisible in logs. Adding logging to document true root cause of any device info failures stemming from an underlying failure. Bug: 16982203 Change-Id: I8a48714e1ddbde8b8eac35f149136d19efce5fb8
* | | | Merge "Consolidate parameter caching in camera1 portability agent" into lmp-devAlan Newberger2014-08-151-55/+90
|\| | |
| * | | Consolidate parameter caching in camera1 portability agentAlan Newberger2014-08-151-55/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing implementation of the AndroidCameraAgentImpl uses a 'mParamsToSet' upon which is projects requested settings changes in applySettings(). But, this mParamsToSet is initialized only upon camera open! So 'hidden' parameters like video-size are stuck in the value upon open. Instead, they should be current to the last call to refreshSettings. To simplify, removed this and another copy of parameters (mParameters), introduced one cache class, and use it throughout the agent. Tested and app seems to work OK in general with the change, and specifically confirmed that video size parameters are not reverted after start, as was observed before the change. Bug: 16991558 Change-Id: I8f2749b8ab2ccc2cb858b8cd844330c5a482f79c
* | | | Merge "camera2-portability: Provide preview transformation matrix" into lmp-devSol Boucher2014-08-152-16/+118
|\ \ \ \
| * | | | camera2-portability: Provide preview transformation matrixSol Boucher2014-08-152-16/+118
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applying this transform to the Surface on which the stream is displayed results in a correctly rotated image. For API 1, the rotation is actually performed by the Camera class and the returned matrix is an identity matrix; however, for API 2, the transformation is responsible for proper orientation. Bug: 16875535 Change-Id: I044ffbd1095bd1a9792c899b792129cc94c7c916
* | | | Merge "camera2-portability: Make factory offer choice of backing API" into ↵Sol Boucher2014-08-154-14/+179
|\ \ \ \ | | | | | | | | | | | | | | | lmp-dev
| * | | | camera2-portability: Make factory offer choice of backing APISol Boucher2014-08-154-14/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps using the library to decide whether to jump to the new API. Users of the library may choose to use the Camera class, the camera2 API, or have the choice made automatically based on the device's API level. The choice may also be globally overridden by means of a system property. Bug: 16875535 Change-Id: I92e4be96fbd04057be61ceb8a0c58935770022f6
* | | | | Merge "Add public method to check if the partition is empty." into lmp-devNancy Chen2014-08-151-1/+5
|\ \ \ \ \
| * | | | | Add public method to check if the partition is empty.Nancy Chen2014-08-151-1/+5
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the size of the partition is hidden from public. The isEmpty method will allow outside classes to check if the partition does not have any entries in it. Bug: 15596340 Change-Id: I0a0f8f7c7a350b802e58e9138801c13b6e74a059
* | | | | Merge "camera2-portability: Improve capability conversions' null-safety" ↵Sol Boucher2014-08-151-6/+14
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into lmp-dev
| * | | | camera2-portability: Improve capability conversions' null-safetySol Boucher2014-08-131-6/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This makes it harder for unexpected nulls in CaptureRequest templates to cause exceptions while unboxing Integer wrappers. Such crashes were observed on some devices while running on the legacy layer, especially with scene modes. Change-Id: I0cae95534f138e97f2c589d15e81f77b4f2141f7
* / | | camera2-portability: Report correct sizes for preview and captureSol Boucher2014-08-131-7/+7
|/ / / | | | | | | | | | | | | | | | | | | This reports JPEG capture sizes instead of YUV ones, and ensures that preview sizes match TextureView, not SurfaceView. Change-Id: I2963ee1741156cc2a29e2e65308bd14dd145e4c8
* | | Merge "Fix missing zoom fields in copy constructor of CameraCapabilities" ↵Alan Newberger2014-08-071-0/+2
|\ \ \ | | | | | | | | | | | | into lmp-dev
| * | | Fix missing zoom fields in copy constructor of CameraCapabilitiesAlan Newberger2014-08-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These fields are deprecated but while we have them, should copy them in the constructor. This contributes to a zoom bug in the app, since ratios and indices are dropped upon copy. Bug: 16527845 Change-Id: I008384faa77e0c13a2790e095fa311909c1e9b44
* | | | Merge "camera2-portability: Support photo capture using camera2 API" into ↵Sol Boucher2014-08-0715-560/+1137
|\ \ \ \ | |/ / / |/| | | | | | | lmp-dev
| * | | camera2-portability: Support photo capture using camera2 APISol Boucher2014-08-0715-560/+1137
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements JPEG capture, including an autoexposure precapture sequence. There are many changes to AndroidCamera2Capabilities and AndroidCamera2Settings to support the representation of modes (e.g. flash modes) whose flags do not map trivially between the API implementations. Part of this work is the conversion of AndroidCamera2AgentImpl to use and store a Camera2RequestSettingsSet instead of a bare API 2 CaptureRequest.Builder. Change-Id: I03f9f98c954a7b0c140ac8d80161878c92ef65d2
* / / Camera2: Remove hidden callbacksEino-Ville Talvala2014-08-042-80/+4
|/ / | | | | | | Change-Id: I4038f0aff5e82531ca2b6231feee9ade36ddbb75
* | Merge "Create new com.android.ex.camera2.utils package" into lmp-devSol Boucher2014-07-298-0/+1001
|\ \
| * | Create new com.android.ex.camera2.utils packageSol Boucher2014-07-308-0/+1001
| | | | | | | | | | | | | | | | | | | | | | | | | | | It contains: - Camera2RequestSettingsSet class for storing/unioning CaptureRequest.Builders - A Camera2CaptureListenerSplitter class for connecting multiple such listeners - A Camera2CpatureListenerForwarder for relaying callbacks to another Handler Change-Id: I47381e4a45b4232b86e5498a1cc39cc600b5c5c5
* | | add TORCH support to camera1 portability libraryAlan Newberger2014-07-301-0/+2
| | | | | | | | | | | | | | | | | | | | | In the move to the portability library, TORCH mode got dropped. Bug: 16680156 Change-Id: I3878c2399246bdb5cc80311c49533971c0c4c3d2
* | | camera2: Add BlockingCaptureListener class.Ruben Brunk2014-07-252-2/+166
|/ / | | | | | | | | | | Bug: 15116722 Change-Id: Ib843dea27175dece8857359707318323a57f5409
* | Merge "camera2-portability: Add focus locks and touch-to-focus for API 2" ↵Sol Boucher2014-07-242-54/+330
|\ \ | | | | | | | | | into lmp-dev
| * | camera2-portability: Add focus locks and touch-to-focus for API 2Sol Boucher2014-07-242-54/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | This implements focus locks very simply using only camera2 API requests: the lens is locked on autoFocus() and unlocked on cancelAutoFocus(), as with the existing legacy API--backed implementation. Both passive and active focus modes ares supported, with and without positional focusing. Change-Id: I26b1866539807fd3d64189923871443056a166af
* | | am 73513fb9: am b50ab0c2: am 3fbecf11: Update build.gradle from masterJustin Klaassen2014-07-210-0/+0
|\ \ \ | | | | | | | | | | | | | | | | * commit '73513fb9babbf8efbff930cb4cc81acdb1f1fdf3': Update build.gradle from master
| * \ \ am b50ab0c2: am 3fbecf11: Update build.gradle from masterJustin Klaassen2014-07-211-28/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'b50ab0c2167956317e7fc2358e87320991418cf5': Update build.gradle from master
| | * \ \ am 3fbecf11: Update build.gradle from masterJustin Klaassen2014-07-211-28/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3fbecf118b05748b5e9f6feae596c30eca64ccc9': Update build.gradle from master
| | | * | | Update build.gradle from masterJustin Klaassen2014-07-181-28/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I858554625d69dbc34f7174a5c8526d602113b569
* | | | | | Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-1911-308/+0
| |_|_|/ / |/| | | | | | | | | | | | | | Change-Id: Id1e3730d897e9f7e8f416fdae0d1da106a63097c
* | | | | DO NOT MERGE: Fix oversight while refactoring CameraStateHolderSol Boucher2014-07-163-42/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The base class still (redundantly) defined states, and AndroidCameraStateMachine was overriding methods with a verbatim copy of their implementations. Change-Id: I0e6361417edb159f91b89409058ee9a73b1101d9 (cherry-picked from commit dbc457417c581c21b5d49539325b1b152dc1baba)
* | | | | camera2-portability: Add support for previews using the camera2 APISol Boucher2014-07-0818-610/+1988
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment, only SurfaceTextures (and not SurfaceViews/SurfaceHolders) are supported. The tests still only cover Stringifier and IntegralStringifier. Change-Id: Ie643c58f8383cd3b9f59c16e0b79239df0ca068d
* | | | | am 366ddf74: (-s ours) am 6f3df8c8: (-s ours) am 0df20a5f: (-s ours) am ↵Baligh Uddin2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d25a637: (-s ours) Import translations. DO NOT MERGE * commit '366ddf74b427109ff2470aa468da2fe5bf1ab5d1': Import translations. DO NOT MERGE
| * | | | am 6f3df8c8: (-s ours) am 0df20a5f: (-s ours) am 2d25a637: (-s ours) Import ↵Baligh Uddin2014-07-060-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '6f3df8c87787838cb66eb092480e3a5e216955d1': Import translations. DO NOT MERGE
| | * | | am 0df20a5f: (-s ours) am 2d25a637: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| |/| | | | | |/ / | | | | | | | | | | | | * commit '0df20a5fc1919af07f8aadd5e1b4f290b2bfa8d4': Import translations. DO NOT MERGE
| | * | am 2d25a637: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-07-060-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '2d25a6375973c5f49eccfa4228bd3eb6620709b1': Import translations. DO NOT MERGE
| | | * | Import translations. DO NOT MERGEBaligh Uddin2014-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8c32827422ba30ceda810833b72261ef4b3f164b Auto-generated-cl: translation import
* | | | | am 000bd252: (-s ours) keep history after reset to ↵Baligh Uddin2014-07-060-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a03388cf9a9bcd78400b6f79aa360a5d1e71c7ac * commit '000bd2527105f0bdf825a65cbf82a1133d1e0bae': Import translations. DO NOT MERGE
| * | | | keep history after reset to a03388cf9a9bcd78400b6f79aa360a5d1e71c7acBaligh Uddin2014-06-230-0/+0
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-06-1936-0/+756
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I22572a812a8337792bf521aec68d3ac1cc2a2400 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-07-058-0/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iadc3979ff2a08d485d92a12ff29472f3cd447743 Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 08:45:07 +0000