summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/api1
Commit message (Collapse)AuthorAgeFilesLines
* am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry ↵Eino-Ville Talvala2014-05-121-0/+3
|\ | | | | | | | | | | | | count before reading it" * commit '7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0': camera: check Intent entry count before reading it
| * 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
| | * 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
| * | 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
| * | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aospColin Cross2014-03-218-34/+40
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I19e1a26bd0226119c4fe2920bf6a09aaeff315d9
| * | | 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
| * | | 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
* | | | | Camera: don't dereference timestamp if it is missingZhijun He2014-04-141-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14059542 Change-Id: I8b45a98ef4b296db314cab3819d11626ac7211be
* | | | | CameraService: trigger appropriate callbacks for burst capture.Jianing Wei2014-04-108-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Instead of tracking CameraMetadata only, now we track both CameraMetadata and CaptureResultExtras, which is not part of the HAL metadata. This will enable the correct callback of onCaptureStarted and onResultReceived given burst requests. * Get last frame number in reply when submitting requests, canceling requests, and flushing device. For repeating requests, this frame number is the last frame number of the previous request. For non-repeating requests, this frame number is the expected last frame number of the current request. The goal is provide frame number to Java side in order to trigger onCaptureSequenceCompleted correctly. * Fix notifyError so that onDeviceError can be called correctly. Bug: 10749500 Change-Id: I2f3dda6c530090055d4a2ff9f0f087bbbe8d9257
* | | | | Camera3: fix HAL3.x version check issueZhijun He2014-03-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera service should support HAL3.x instead of only HAL3.0. Bug: 13609405 Change-Id: If7e86f9abe019547fc0be2e11337551cd7c57870
* | | | | Revert "camera: Fix setParameters for Preview FPS single/range values"Eino-Ville Talvala2014-03-261-116/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes a regression on some devices, so reverting until we're in a position to fix those devices. This reverts commit 9078a1b3b9f9c0c48046ade0e8e18b0d79a659db. Bug: 13563098 Change-Id: I7aedd01fde8b8fdee77e972ec395f0ecadbf8ccb
* | | | | am 5c679d41: resolved conflicts for merge of 3d7c5002 to ↵Colin Cross2014-03-248-34/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit '5c679d41714e42f153f6aeb492df54510a195bc1': libcameraservice: build 64-bit libcameraservice: fix 64-bit print format warnings
| * \ \ \ \ resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aospColin Cross2014-03-218-34/+40
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Change-Id: Ia6d87d56174d1388c1148fb55b6e4bc57d8666db
| | * | | | libcameraservice: fix 64-bit print format warningsColin Cross2014-03-218-34/+40
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use PRId64 from inttypes.h to print nsecs_t (int64_t) Use %zu to print size_t Change-Id: I135620e0388db33587a8a7da393b48a45cb7275a
| * | | | am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ↵Zhijun He2014-03-111-0/+16
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | preview size is changed * commit 'f0fb921c0170fe3b8ebce8fbe3c133a99c6def9f': 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 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into ↵Eino-Ville Talvala2014-03-073-55/+66
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | | | | | | | klp-dev * commit '47ef192f0296642b901e82d0c72c5a1a0d08f4df': 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: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-201-41/+116
| | | | | | | | | | | | | | | Bug: 12609188 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db
* | | Remove deprecated BufferQueue constructorDan Stoza2014-03-124-12/+20
| | | | | | | | | | | | | | | Bug: 13415624 Change-Id: Ifc8f778b70102a38a9f7a086632e6884714e6b58
* | | Merge "camera2: Fix race with stream deletion during disconnect."Ruben Brunk2014-02-241-6/+8
|\ \ \
| * | | camera2: Fix race with stream deletion during disconnect.Ruben Brunk2013-12-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.
* | | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-114-4/+5
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-114-4/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | camera3: Update maxRegions tag.Ruben Brunk2014-02-042-9/+38
| | | | | | | | | | | | Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01
* | | Camera: fix focusArea wrong indexing issueZhijun He2014-01-291-14/+14
| | | | | | | | | | | | | | | Bug: 12304559 Change-Id: Id28b35fdd9697c1ec3365f617996801965de8bd0
* | | Merge "Camera: delete preview callback when preview size is changed"Zhijun He2014-01-271-0/+16
|\ \ \
| * | | Camera: delete preview callback when preview size is changedZhijun He2014-01-241-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
* | | | Merge "Camera3: Flush device before ZSL reprocess"Zhijun He2014-01-271-0/+9
|\ \ \ \ | |/ / /
| * | | Camera3: Flush device before ZSL reprocessZhijun He2014-01-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call flush before sending ZSL reprocess request. This not only ensures no in-flight requests pending in the HAL before ZSL reprocess request, but also makes reprocess request to be processed by the HAL sooner. Bug: 12230973 Change-Id: I4c9e5a0fb75ccdc1e8861262c08d599d04170b7f
* | | | Merge "Camera: delete zsl stream for video mode"Zhijun He2014-01-241-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Camera: delete zsl stream for video modeZhijun He2013-11-011-0/+2
| | | | | | | | | | | | | | | | Change-Id: I9ebfe0cb7376092c6ecd71e5c1c5058947282a5f
* | | | camera3: Update sceneMode tag spec.Ruben Brunk2014-01-172-10/+10
| |_|/ |/| | | | | | | | Change-Id: I495435397086a295280c556d94fe8efd442a12c3
* | | camera2/3: Add protection for still capture pathZhijun He2013-11-261-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
* | 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 HAL3/API1: Add support for the partial result quirk.Eino-Ville Talvala2013-11-065-78/+158
|/ | | | | | | | | | | | | | | | | | - 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: 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
* 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-116-1/+56
|\ \ | |/ |/|
| * Camera2/3: Add more tracing for API1Eino-Ville Talvala2013-10-106-1/+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-091-1/+1
|/ | | | | | | | | | 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
* Camera API 2, Device 2/3: Implement idle and shutter callbacksEino-Ville Talvala2013-10-026-7/+7
| | | | | | | | | | | | | | | | | | - 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: 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
* Merge "Camera2/3: Support new PASSIVE_UNFOCUSED AF state" into klp-devEino-Ville Talvala2013-09-251-0/+3
|\
| * Camera2/3: Support new PASSIVE_UNFOCUSED AF stateEino-Ville Talvala2013-09-201-0/+3
| | | | | | | | | | Bug: 10860639 Change-Id: I39be64abaf79b49b2d1f74e1c2ab2adf718ae701