summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice
Commit message (Collapse)AuthorAgeFilesLines
* am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-2/+2
|\ | | | | | | | | * commit 'd551633916d3677da4dda10aba6837bdc6803ee0': Move frameworks/av from fdprintf to POSIX dprintf.
| * Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-2/+2
| | | | | | | | | | Bug: 11156955 Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
* | am f02f06c4: Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
|\ \ | |/ | | | | | | * commit 'f02f06c422a58ddaca49d14f21a196eaa435d07b': camera: check Intent entry count before reading it
| * Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| |\
| | * camera: check Intent entry count before reading itYuvraj Pasi2014-05-121-0/+3
| | | | | | | | | | | | | | | | | | | | | In case when find() returns empty entry, blindly reading the entry will cause segfault Change-Id: Ib5be7fd855c409ba3b45f0d43e15237367172817
* | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-295-99/+213
|\ \ \ | |/ / |/| |
| * | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS ↵Igor Murashkin2014-03-252-44/+121
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | single/range values * commit '0370be96e33ea0c8fb4069e704deccce43b7403c': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
| | * | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-252-44/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a workaround, duplicate CameraParameters into CameraParameters2 to prevent ABI break for some camera HALs that directly link into CameraParameters. CameraParameters2 implements the real fixes needed in the framework, while CameraParameters is left in to satisfy older camera HALs. Bug: 12609188 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
| * | | am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '4f53fe74051026e6635ba5bdbed4f1898cb66028': CameraService: deadlock fix
| * | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aospColin Cross2014-03-2120-70/+80
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I19e1a26bd0226119c4fe2920bf6a09aaeff315d9
| * \ \ \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'bd3e2e03f3ab686c52982a9e50cae853128172cf': camera2: Fix segfault when using null availability listener
| | * | | camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICameraService::addListener / removeListener will now return BAD_VALUE if a null listener is used. Bug: 12891434 Change-Id: I9764110094d8fd42e22fcc8df3ef0e73c1b070e7
| * | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-141-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only
| * \ \ \ \ am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ↵Zhijun He2014-03-101-0/+16
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | is changed * commit 'bc69c8ba9a8fc881603669205a56d0ca1b572a95': DO NOT MERGE: Camera: delete preview callback when preview size is changed
| | * | | | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview callback stream is left configured even the preview size is changed. This makes the callback stream unnecessarily configured even in recording mode, which could cause distorted preview for some devices. Bug: 12210027 Bug: 12591410 Change-Id: If50cddfe5562e91aec1feb1760eccb82ddb21730
| * | | | | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a11111f9135c98cf4247bbd1a61d7df3053e549e': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| | * | | | DO NOT MERGE: Camera: fix focusArea wrong indexing issueZhijun He2014-03-051-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12304559 Change-Id: Id28b35fdd9697c1ec3365f617996801965de8bd0
| | * | | | DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.Ruben Brunk2014-03-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11856804 - Shutdown order in Camera2Client allows a stream to be deleted before the corresponding processing thread has quit. This can result in updates being called on the processor thread without a valid stream. Change-Id: Ie4e649771f4321498659211f2a37ed89a6d956c4
| | * | | | DO NOT MERGE: camera2/3: Add protection for still capture pathZhijun He2014-03-051-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jpeg stream in JpegProcessor could be deleted while process new capture is ongoing, which unsafe to access a dead consumer endpoint. Bug: 9316454 Change-Id: I2950f31ea28d0ba01f08502e2e3ba452bf8bb818
* | | | | | camera: set mNeedConfig after creating ZSL streamYuvraj Pasi2014-04-151-0/+2
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set mNeedConfig after creating ZSL stream, camera device will reconfigure for the case when only ZSL stream is changed. Change-Id: Ib592817f81125969824a1280349f77973116f375
* | | | | CameraService: deadlock fixKalle Lampila2014-03-251-0/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Release lock before return from CameraService::dump() Change-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774 Signed-off-by: Kalle Lampila <kallex.lampila@intel.com>
* | | | libcameraservice: build 64-bitColin Cross2014-03-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | libcameraservice builds fine for 64-bit, remove LOCAL_32_BIT_ONLY Change-Id: I9f28bc42dc424dee9b92e6ab092f86d3aa1419b7
* | | | libcameraservice: fix 64-bit print format warningsColin Cross2014-03-2119-69/+80
| |_|/ |/| | | | | | | | | | | | | | | | | Use PRId64 from inttypes.h to print nsecs_t (int64_t) Use %zu to print size_t Change-Id: I135620e0388db33587a8a7da393b48a45cb7275a
* | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+1
|/ / | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
* | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-118-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | Merge "libcameraservice: Fix build in ISO C++11 mode"Eino-Ville Talvala2014-01-151-5/+5
|\ \ | |/ |/|
| * libcameraservice: Fix build in ISO C++11 modeBernhard Rosenkraenzer2013-07-301-5/+5
| | | | | | | | | | | | | | | | Change log macro define so it can't be confused for a C++11 string literal Change-Id: Idcc8085735177aa3313fdea66dc0736cca749f9b Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | Camera2: Rework the FPS range vs. FPS single setting detectionEino-Ville Talvala2013-11-142-33/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give up on current approach of writing out consistent FPS values into parameters that will be read back by the app. - Preserve app's latest set parameters exactly, and compare against them when detecting if a new FPS range or single FPS value has been selected. - Since get() returns exactly what was set(), it doesn't matter if the app calls getParameters() before its next setParameters(), in terms of retriggering FPS selection logic. Before, the behavior varied depending on whether the app re-read the parameters. - As before, if app changes both range and single FPS in a single set call, the range set wins. Otherwise, the value that has changed more recently is used. Bug: 11570973 Change-Id: I72b5e60c3f60e88d55127dd1bda87e26eaf929c6
* | Camera API2: Add support for partial result quirkEino-Ville Talvala2013-11-125-14/+29
| | | | | | | | | | | | | | | | | | - Camera3Device: Include requestId in partial 3A results - FrameProcessorBase: Add support for partial result listeners - CameraDeviceClient: Listen and forward partial results to client Bug: 11115603 Change-Id: If1cc6bbc32932742ac142c058688761ebf6a8024
* | Camera HAL3/API1: Add support for the partial result quirk.Eino-Ville Talvala2013-11-068-86/+432
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Camera2Client: - Detect partial result quirk - Camera3Device: - Accumulate all partial results together - Fire off 3A-only result once all 3A states are available - FrameProcessorBase: - Filter out partials, don't send to listeners - FrameProcessor: - Skip face detect on partials - Make sure to only handle a 3A update for a given frame once - Trigger AF notifications when AF mode or trigger changes, to properly detect all AF transitions. Bug: 11115603 Change-Id: Iea8aa73c568701562a46071f7ea100624251d10b
* | camera: Collect stack traces when bad things happen, print with dumpsysIgor Murashkin2013-10-295-0/+171
| | | | | | | | | | Bug: 11324229 Change-Id: Ic920e170a8f5a389fc139bbf5416c0e3186c7fb6
* | Camera: don't do hw support check for ZSLZhijun He2013-10-161-13/+5
| | | | | | | | | | | | | | Only use camera.disable_zsl_mode to control disable/enable ZSL. Bug: 11258054 Change-Id: Ibf10b959d0913f7dedb59d89b571e9bf66fe978a
* | Camera: Fix deadlock in Camera3OutputStreamZhijun He2013-10-111-1/+16
| | | | | | | | | | | | | | | | | | | | | | process capture request thread, process capture result and setParameter binder threads can run into circular locking situation when acquiring StreamingProcessor lock, Camera3Stream lock, and bufferQueue lock. Releasing the Camera3Stream lock briefly in process capture request thread getbuffer call can break this deadlock. Bug: 11016037 Change-Id: If08d4b134c26be26039b1d5363759e60f911bad6
* | Merge "Camera: Skip AE precapture when possible" into klp-devZhijun He2013-10-111-0/+12
|\ \
| * | Camera: Skip AE precapture when possibleZhijun He2013-10-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Skip AE precapture when AE is already converged for still capture use case. This could save still capture latency 6-7 frame time for AE already converged case. Bug: 10712902 Change-Id: Ie5512618b76e5d87c62c57c3d96d2004c604e29e
* | | Merge "Camera2/3: Add more tracing for API1" into klp-devEino-Ville Talvala2013-10-117-2/+56
|\ \ \ | |/ / |/| |
| * | Camera2/3: Add more tracing for API1Eino-Ville Talvala2013-10-107-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AF state - Async autofocus completion - Async takePicture completion - Stages of takePicture Bug: 10570497 Change-Id: Ida9fedd81aa4ee3ae3fb8dfada858a3bc3c213a3
* | | Camera: Save 1 frame time for takePicture callZhijun He2013-10-093-10/+10
|/ / | | | | | | | | | | | | | | | | | | Move the latest request signal call right before submitting request to HAL, which avoids unnecessary 1 frame time wait. Also fix request status constructor issue, and the log tag for Camera2Client. Bug: 10570497 Change-Id: I0b1818658bee9983b117e49a5a00f1aab515c567
* | Merge "camera2: Don't race while dumping last frame metadata" into klp-devIgor Murashkin2013-10-082-1/+10
|\ \
| * | camera2: Don't race while dumping last frame metadataIgor Murashkin2013-10-072-1/+10
| | | | | | | | | | | | | | | Bug: 11095203 Change-Id: Icfb31e1719634b62004d6c15a95a9316e9642e4c
* | | Camera3: Improve resilience to stream failuresEino-Ville Talvala2013-10-082-13/+13
|/ / | | | | | | | | | | | | | | - Handle binder connection drops (DEAD_OBJECT) for streams - Just log an error, don't go to an error state when queue/dequeue fails Bug: 10347526 Change-Id: Ib463ffe15d58db444cf5d8cad176a201c7d1facc
* | Merge "Camera3: track request status in inflight queue" into klp-devZhijun He2013-10-032-1/+18
|\ \
| * | Camera3: track request status in inflight queueZhijun He2013-10-032-1/+18
| | | | | | | | | | | | | | | Bug: 9758581 Change-Id: I1d7135cd0932bd6b453acabfeb9a553985c887bc
* | | Camera API 2, Device 2/3: Implement idle and shutter callbacksEino-Ville Talvala2013-10-0228-301/+950
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update callback Binder interface - Rename frameId to be requestId to be consistent and disambiguate from frameNumber. - Implement shutter callback from HAL2/3 notify() - Add in-flight tracking to HAL2 - Add requestId to in-flight tracking - Report requestId from shutter callback - Implement idle callback from HAL3 process_capture_result - Add new idle tracker thread - Update all idle waiting to use the tracker - Add reporting from request thread, all streams to tracker - Remove existing idle waiting infrastructure Bug: 10549462 Change-Id: I867bfc248e3848c50e71527e3561fe92dc037958
* | Camera: only return static metadata for HAL3 deviceZhijun He2013-10-011-0/+6
| | | | | | | | | | | | | | This effectively disables the camera2 APIs for HAL2.x or lower HAL device. Bug: 10360518 Change-Id: I0f374ac533468c6181f5672c75088b7144b9c53d
* | Camera: drop stale callback bufferZhijun He2013-09-301-0/+10
| | | | | | | | | | | | | | | | | | | | Sometimes, when preview size is changed and preview callback is enabled, stale callback buffer from previous size could be delivered to callback processor because stop preview doesn't guarantee consumer side buffers are properly cleaned up. We need drop these buffers to avoid sending wrong data to app side. Bug: 11009183 Change-Id: If9281e8c02481f883872ce58dfd8660a06d56a47
* | Camera: Set default thumbnail size with matched aspect ratioZhijun He2013-09-302-3/+41
| | | | | | | | | | | | | | Make default thumbnail size match the default still capture size aspect ratio. Bug: 10885012 Change-Id: If46da9508d3b71992f0e14a35c600b7e8d347f4e
* | Camera2 API: Hack: Always use async mode with GLConsumerEino-Ville Talvala2013-09-261-1/+18
| | | | | | | | | | | | | | | | Until a cleaner solution is implemented, force buffer queues to consumers that set USAGE_HW_TEXTURE usage to be asynchronous. Bug: 10949105 Change-Id: I69e6b02b773831396767c282ce8c5936c5d41f03
* | Merge "Camera: Implement getCameraCharacteristics" into klp-devZhijun He2013-09-252-0/+39
|\ \
| * | Camera: Implement getCameraCharacteristicsZhijun He2013-09-252-0/+39
| | | | | | | | | | | | | | | | | | Bug: 10904541 Bug: 10360518 Change-Id: Ie9ca6b3b0b5f2fe529e6b0decc193096e770a017
generated by cgit v1.1 at 2024-05-27 21:19:44 +0000