summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am d9e8b326: am 747b8492: Camera3: Fix initial orientation configuration.Eino-Ville Talvala2013-05-101-5/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'd9e8b32690078f2cc518a76b3abc501e41fb3aa3': Camera3: Fix initial orientation configuration.
| * | | | | Camera3: Fix initial orientation configuration.Eino-Ville Talvala2013-05-091-5/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | One call to set orientation too many. Bug: 8683719 Change-Id: I4b776fc8665eed940a1f18a6f617be4f1406e41a
* | | | | am e0a4abca: am e464e15a: Merge "camera3: Manage fences properly when ↵Igor Murashkin2013-05-092-24/+75
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | buffers are returned with an error" into jb-mr2-dev * commit 'e0a4abcad6b7e9df99201e35a43b8a8878aa46f8': camera3: Manage fences properly when buffers are returned with an error
| * | | | Merge "camera3: Manage fences properly when buffers are returned with an ↵Igor Murashkin2013-05-092-24/+75
| |\ \ \ \ | | | |/ / | | |/| | | | | | | error" into jb-mr2-dev
| | * | | camera3: Manage fences properly when buffers are returned with an errorIgor Murashkin2013-05-082-24/+75
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8622089 Change-Id: I4df0258d6803d460d4dd98f0a80829eb844ca30d
* | | | | am 12e66666: am 7fe6ac0d: Merge "camera2: Add height to the crop region ↵Igor Murashkin2013-05-091-3/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | metadata property" into jb-mr2-dev * commit '12e666660a8ff9dabc5270a8d06b402481d97a14': camera2: Add height to the crop region metadata property
| * | | | Merge "camera2: Add height to the crop region metadata property" into jb-mr2-devIgor Murashkin2013-05-091-3/+4
| |\ \ \ \
| | * | | | camera2: Add height to the crop region metadata propertyIgor Murashkin2013-05-071-3/+4
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 8756080 Change-Id: I90b9166440e92f7675255a01ddc4a980c2e52201
* | | | | resolved conflicts for merge of c077fc5d to masterEino-Ville Talvala2013-05-094-25/+185
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ic636aaf49ac81c070551f3ba9fc48cfa4932bec0
| * | | | Merge "Camera3: Support flexible YUV for preview callbacks" into jb-mr2-devEino-Ville Talvala2013-05-094-21/+181
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Camera3: Support flexible YUV for preview callbacksEino-Ville Talvala2013-05-074-21/+181
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the HAL supports it, and the client asks for YV12 or NV21, use the new flexible YUV format instead. Bug: 8734880 Change-Id: Ib0129d9c26a6b30f3be7aa624c2439c6edba1bbd
* | | | am a790258a: am a5751c3a: Merge "Camera: Hotplug - conditionally transition ↵Igor Murashkin2013-05-082-12/+33
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | to PRESENT when clients disconnect" into jb-mr2-dev * commit 'a790258aa5061a18ef455061de914c025fa86ded': Camera: Hotplug - conditionally transition to PRESENT when clients disconnect
| * | | Merge "Camera: Hotplug - conditionally transition to PRESENT when clients ↵Igor Murashkin2013-05-072-12/+33
| |\ \ \ | | |/ / | |/| | | | | | disconnect" into jb-mr2-dev
| | * | Camera: Hotplug - conditionally transition to PRESENT when clients disconnectIgor Murashkin2013-05-022-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where a client could unconditionally transition to PRESENT after a client disconnects, even though the underlying HAL status was actually NOT_PRESENT or ENUMERATING. Bug: 8780114 Change-Id: I68adb5fc819eec3b046ddcb2507b84bedc999a0f
* | | | am 41348da3: am ef33d308: Merge "camera3: Don\'t eagerly finish configuring ↵Igor Murashkin2013-05-061-6/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | bidi streams more than once" into jb-mr2-dev * commit '41348da3a614bca05e7a4f6c96b0a91d7df924fe': camera3: Don't eagerly finish configuring bidi streams more than once
| * | | Merge "camera3: Don't eagerly finish configuring bidi streams more than ↵Igor Murashkin2013-05-061-6/+10
| |\ \ \ | | |/ / | |/| | | | | | once" into jb-mr2-dev
| | * | camera3: Don't eagerly finish configuring bidi streams more than onceIgor Murashkin2013-05-021-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finishing all stream configuration immediately is good, but when a stream is both input and output it attempted to finish configuring bidi streams twice. Since all ZSL streams are bidi, when we had a ZSL stream active preview would immediately stop working. Bug: 8563838 Change-Id: Iec998f11f6405fc15f3f31bd7cd29f03a7968d14
* | | | am f9539bb7: am 2628bc9d: Merge "camera3: Don\'t crash when taking a still ↵Igor Murashkin2013-05-021-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | capture with ZSL disabled" into jb-mr2-dev * commit 'f9539bb75101b85033eb45fd283b3fa40eaa8c98': camera3: Don't crash when taking a still capture with ZSL disabled
| * | | Merge "camera3: Don't crash when taking a still capture with ZSL disabled" ↵Igor Murashkin2013-05-021-1/+4
| |\ \ \ | | |/ / | | | | | | | | into jb-mr2-dev
| | * | camera3: Don't crash when taking a still capture with ZSL disabledIgor Murashkin2013-05-021-1/+4
| | | | | | | | | | | | | | | | | | | | Bug: 8790212 Change-Id: I4bf7ac5ab856b0ea1738844182efb86137e14083
* | | | am 86150f33: am a69f3213: Merge "Camera2/3: Fix still image FOV reporting." ↵Eino-Ville Talvala2013-05-022-10/+125
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '86150f33380a93cbc0d1554f5bcd0af2d3ebf246': Camera2/3: Fix still image FOV reporting.
| * | | Merge "Camera2/3: Fix still image FOV reporting." into jb-mr2-devEino-Ville Talvala2013-05-022-10/+125
| |\ \ \ | | |/ / | |/| |
| | * | Camera2/3: Fix still image FOV reporting.Eino-Ville Talvala2013-05-012-10/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still FOV can vary as a function of the output sizes, with the function depending on the HAL version. Calculate and update the FOV whenever the output sizes might change. Bug: 8484377 Change-Id: I56f2cc768a1e128a159b326588be55b2752db06e
* | | | am 1931e9b9: am 3c7c39af: Merge "Camera3: Add missing buffer listener ↵Igor Murashkin2013-05-011-0/+48
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | include (for ZSL)" into jb-mr2-dev * commit '1931e9b9e5ff613f3c45f298e30d717b4a2b15a5': Camera3: Add missing buffer listener include (for ZSL)
| * | | Merge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-devIgor Murashkin2013-05-011-0/+48
| |\ \ \
| | * | | Camera3: Add missing buffer listener include (for ZSL)Igor Murashkin2013-05-011-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8563838 Change-Id: Ie053655f5583d20003abdabccee68980d7cdcbfd
* | | | | am 7a0f7d9f: am d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into ↵Igor Murashkin2013-05-0124-93/+2759
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '7a0f7d9f6cdad84e4b5f6c6b164874393d541824': Camera3: Add ZSL stream support camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames Camera3: Add input stream support
| * | | | Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-devIgor Murashkin2013-05-0124-93/+2759
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Camera3: Add ZSL stream support camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames Camera3: Add input stream support
| | * | | Camera3: Add ZSL stream supportIgor Murashkin2013-04-2919-66/+1751
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8563838 Change-Id: I2feda142ff5172aba17ade5c8d502f9bb5d5b766
| | * | | camera: Add new RingBufferConsumer to keep a ring buffer of acquired framesIgor Murashkin2013-04-293-1/+537
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8563838 Change-Id: I5a95e0be94e5388b30639905efae42d3c3279f72
| | * | | Camera3: Add input stream supportIgor Murashkin2013-04-267-28/+473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Untested with actual CAMERA3_STREAM_INPUT streams. Bug: 8629088 Change-Id: Ia0c21ef0a2c951e401ea8babd15d3cceb4bb25a1
* | | | | am 6feba7db: am d8c7ad1c: Camera: Don\'t complain repeatedly about missing ↵Igor Murashkin2013-04-302-4/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | android.led.availableLeds * commit '6feba7db1144dc383de22a521854d7e983c700fb': Camera: Don't complain repeatedly about missing android.led.availableLeds
| * | | | Camera: Don't complain repeatedly about missing android.led.availableLedsIgor Murashkin2013-04-302-4/+6
| | |/ / | |/| | | | | | | | | | | | | | Bug: 8765726 Change-Id: I78f5f98315068aaad3a39d56698b9c8a18cc8f4a
* | | | am ce68884d: am b7e2ef14: Merge "ProCamera: Add security permission checks ↵Igor Murashkin2013-04-293-0/+82
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | for disabling transmit LED" into jb-mr2-dev * commit 'ce68884da85fdc148756c0b233366b17507e72de': ProCamera: Add security permission checks for disabling transmit LED
| * | | Merge "ProCamera: Add security permission checks for disabling transmit LED" ↵Igor Murashkin2013-04-273-0/+82
| |\ \ \ | | | | | | | | | | | | | | | into jb-mr2-dev
| | * | | ProCamera: Add security permission checks for disabling transmit LEDIgor Murashkin2013-04-253-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8554573 Change-Id: Ie909908a4cab3700bd622282e8342e8fa5b72376
* | | | | resolved conflicts for merge of c853784d to masterEino-Ville Talvala2013-04-2911-149/+263
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I8aecc3c4c533a0444ee5c696f05b5c48ac077dbf
| * | | | Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into ↵Eino-Ville Talvala2013-04-2711-149/+263
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / jb-mr2-dev
| | * | Camera2: Fix deadlock on shutdown due to client getting killed.Eino-Ville Talvala2013-04-2611-149/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the binder connection dies and is the only holder of a strong pointer to the Camera2Client, disconnect is called from the destructor. At this point, all weak pointers to Camera2Client are no longer promotable, and lots of cleanup code paths are broken as a result. Rework all such code paths to not need the client pointer, and to discard image buffers that arrive during shutdown. Bug: 8696047 Change-Id: Ic0672ecde7c1baaf65079f925a45bd5be45f1fb3
* | | | am b524303e: am 5e437722: Merge "Camera3: Register all stream buffers at ↵Eino-Ville Talvala2013-04-231-0/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | stream configuration time." into jb-mr2-dev * commit 'b524303ec9c48377a3a47fb273e0017f8edec142': Camera3: Register all stream buffers at stream configuration time.
| * | | Camera3: Register all stream buffers at stream configuration time.Eino-Ville Talvala2013-04-191-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While registering them later would be nice for startup time, current hardware will have to reinitialize everything, resulting in glitches. Bug: 8657740 Change-Id: I1ed1f0a65d648f219f5228c8df15ffcf2a4b272e
* | | | Merge "Camera: Add preview callback surface support"Eino-Ville Talvala2013-04-189-21/+146
|\ \ \ \ | |/ / / |/| | |
| * | | Camera: Add preview callback surface supportEino-Ville Talvala2013-04-179-21/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add call to set a preview callback surface - Implement support for HAL2/3 devices - Still need HAL1 implementation Change-Id: I0dc0bd72e43d871aa487858d1665c1efca633ffe
* | | | Camera3: Allow multiple process_capture_result calls per requestEino-Ville Talvala2013-04-152-43/+236
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To simplify HAL implementation, allow the results for a single capture request to be sent from the HAL across multiple calls to process_capture_request. This requires that the HAL must call notify() with the SHUTTER message to indicate start of exposure time, before the first call to process_capture_result for a given frame. Bug: 8565103 Change-Id: I6a61449725f98af88769fafa07736848a226dad2
* | | Merge "Camera3: Improve error logging" into jb-mr2-devEino-Ville Talvala2013-04-112-131/+183
|\ \ \
| * | | Camera3: Improve error loggingEino-Ville Talvala2013-04-092-131/+183
| |/ / | | | | | | | | | | | | | | | | | | In preparation for supporting fragmented result calls. Bug: 8565103 Change-Id: Id834637d7cbecf7b550333beedab3281b5400748
* | | Add liblogYing Wang2013-04-091-0/+1
|/ / | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* | Camera: implement takePicture for HAL3-using clientsIgor Murashkin2013-04-054-21/+414
| | | | | | | | | | | | | | * Implements Camera2Device-style triggers by mutating the next request * Implements Camera3Device::waitUntilRequestReceived Change-Id: Ie0b5591158872513a0bffbfab33123cf18dacf8a
* | Camera3: Fix output stream creation for JPEG streamsIgor Murashkin2013-04-021-1/+8
| | | | | | | | Change-Id: Iadf85c103c21614abb1aeb69a832ca01919c2aa5
* | Camera3: Fix metadata result not being rewritten after captureIgor Murashkin2013-04-021-3/+11
| | | | | | | | | | | | | | Generally this problem manifested itself as the Frame Count not being set, which then errored out ProFrameProcessor with a "Success" error. Change-Id: Ifa927f43d0ce92100651ad3f714099a2f1ec4c2a