summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/api1
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | 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 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
* | 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
* 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
* | Camera2/3: Properly disambiguate FPS range vs. single FPS settingEino-Ville Talvala2013-09-202-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The camera1 API allows for either setPreviewFrameRate or setPreviewFPSRange, so both values may or may not change in a single setParameter call. The disambiguation of which setting has been changed since the last setParameter() call was not fully correct, so a sequence of changes that only changed setPreviewFPSRange or didn't change either could be interpreted as as a change to setPreviewFrameRate. Bug: 10842868 Change-Id: I40baeced80a58f09f8a1742ece8dd5e141e9c1e3
* | Camera2/3: For still captures, use widest FPS range available.Eino-Ville Talvala2013-09-203-2/+43
|/ | | | | | | | | | Instead of using the application-selected preview FPS range for still captures, select the widest FPS range advertised by the device and use it for still captures instead, to give the HAL the widest range of exposure values to choose from possible. Bug: 10842868 Change-Id: I0e24f5eb713a4f8df116cd5979a84390cc0974d7
* Camera: setCallBackWindow only if callback surface is usedZhijun He2013-09-161-1/+1
| | | | | | | | | Calling setCallBackWindow without checking the previewCallbackSurface could make the stream to be deleted during callback stream operation, which is bad because the preview is still active and the delete fails. Bug: 10730496 Change-Id: I8addac25e5aa7901bf200d730c749bee2c088090
* Camera: Limit supported preview sizesZhijun He2013-09-132-20/+61
| | | | | | | | | | | The ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES can provide sizes as large as jpeg sizes, which could cause potential issues when trying to do full size still capture and full size preview. This is not supported by many devices due to hardware limitation. This change limits the preview (as well video) size to no more than 1080p. Bug: 10625115 Change-Id: I9467ab843553ec06e8249b4a17c0ecf4c6d6f04e
* Camera: Correct stream id typesZhijun He2013-09-086-18/+18
| | | | | Bug: 10604704 Change-Id: I223ac5d200eb6439c08955fb7ad586592099fbae
* Camera: Send VIDEO_SNAPSHOT intent for video snapshot caseZhijun He2013-09-061-0/+6
| | | | | Bug: 9924539 Change-Id: Ief39eff79c31f2c2aa5df2fe1a0f04c4afc74690
* camera: Fix race condition between setParameters() and stopPreview().Ruben Brunk2013-09-051-0/+1
| | | | | Bug: 10414772 Change-Id: I928cb3935afb101da8a7931f88c27dccdb03b4a9
* Camera2/3: Increase precapture start timeoutEino-Ville Talvala2013-09-031-1/+1
| | | | | | | | | | | | | | | | Currently, we only wait 200 ms for the HAL to switch to the precapture state. This is insufficient at low preview frame rates (dark conditions, ~10 fps), where a 3-request-deep HAL pipeline will take 300 ms to produce a precapture trigger output. In those cases, we would prematurely skip the precapture sequence, causing bad quality pictures. Since this is a fallback timeout to prevent deadlock in case of a bad HAL or framework implementation, increase the timeout to 1 second. Has no impact on correctly-working implementations Bug: 10430191 Change-Id: I08e99f8e7f3beb8f15dcee32632cdebfe3dca8b3
* Camera1: Set preview to be asynchronous, and remove dead codeEino-Ville Talvala2013-08-214-37/+14
| | | | | | | | | | | | | - Use the controlledByApp flag to make sure application-bound preview buffer queue is asynchronous as before - Remove setPreviewDisplay in service, since it is no longer in the binder interface - Rename setPreviewTexture to setPreviewTarget, to make it clear it's the only game in town now. Rename only on the binder level and service for now. Bug: 10312644 Change-Id: Icd33a462022f9729a63dc65c69b755cb7969857e
* separte producer and consumer interfacesMathias Agopian2013-08-064-8/+4
| | | | | Bug: 9265647 Change-Id: Iefabc11e4bd2e2e8ffd31160476c450affe6629c
* Camera: Rename new API to camera2, rearrange camera serviceEino-Ville Talvala2013-07-3026-0/+11503
- Support API rename from photography to camera2 - Reorganize camera service files - API support files to api1/, api2/, api_pro/ - HAL device support files into device{1,2,3}/ - Common files into common/ - Camera service remains at top-level Change-Id: Ie474c12536f543832fba0a2dc936ac4fd39fe6a9