summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "camera3: Dump latest request sent with dumpsys" into klp-devIgor Murashkin2013-09-092-1/+78
|\ \
| * | camera3: Dump latest request sent with dumpsysIgor Murashkin2013-09-062-1/+78
| | | | | | | | | | | | | | | Bug: 10606535 Change-Id: I0dd5ca3e09f45701659ab9ebd3b51939a2f6e6ba
* | | Camera: Correct stream id typesZhijun He2013-09-088-21/+21
| | | | | | | | | | | | | | | Bug: 10604704 Change-Id: I223ac5d200eb6439c08955fb7ad586592099fbae
* | | Camera: Send VIDEO_SNAPSHOT intent for video snapshot caseZhijun He2013-09-061-0/+6
|/ / | | | | | | | | Bug: 9924539 Change-Id: Ief39eff79c31f2c2aa5df2fe1a0f04c4afc74690
* | Merge "camera: Fix race condition between setParameters() and ↵Ruben Brunk2013-09-061-0/+1
|\ \ | | | | | | | | | stopPreview()." into klp-dev
| * | camera: Fix race condition between setParameters() and stopPreview().Ruben Brunk2013-09-051-0/+1
| | | | | | | | | | | | | | | Bug: 10414772 Change-Id: I928cb3935afb101da8a7931f88c27dccdb03b4a9
* | | Fix CameraService error flag when running HAL1 with API2.Ruben Brunk2013-09-041-2/+2
|/ / | | | | | | | | | | Bug: 10620944 Change-Id: I44c0d09a3d313ae8f724fbe61fa5f36cf5b38b6d
* | 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
* | Merge "camera: Fix deadlock when sending callbacks during disconnect" into ↵Igor Murashkin2013-08-301-6/+4
|\ \ | | | | | | | | | klp-dev
| * | camera: Fix deadlock when sending callbacks during disconnectIgor Murashkin2013-08-291-6/+4
| | | | | | | | | | | | | | | Bug: 10552448 Change-Id: Ie93ba744ae6705aa657f980ae8e08ec624feeb39
* | | Camera3: Be busy as soon as work arrives.Eino-Ville Talvala2013-08-292-1/+19
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | RequestThread's internal busy flag (mPaused) was not being immediately set when new work was submitted to it. This allowed for a race condition where a capture() followed by an immediate waitUntilDrained() would immediately return from the wait. Set the mPaused flag to false immediately in capture() and setStreamingRequest() to avoid this, instead of waiting until the end of the next RequestThread iteration. Bug: 10531739 Change-Id: I54a79fe5361d527ec717f41ad805e9b319a48cd8
* | Camera2: Add flush supportEino-Ville Talvala2013-08-237-3/+80
| | | | | | | | | | | | | | | | - On HAL2 devices, fall back to wait until idle - On HAL3 devices, call HAL flush method Bug: 9758581 Change-Id: Ie1c570a15f6590a1ee6c271e3b989c48079b468a
* | Camera1: Set preview to be asynchronous, and remove dead codeEino-Ville Talvala2013-08-215-39/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | Refactor CameraService to handle errors properly.Ruben Brunk2013-08-162-64/+81
| | | | | | | | | | | | | | | | Bug: 10361136 -Connect calls now return status_t error flags. Change-Id: Idca453b111e5df31327f6c99ebe853bb2e332b95
* | separte producer and consumer interfacesMathias Agopian2013-08-069-34/+18
| | | | | | | | | | Bug: 9265647 Change-Id: Iefabc11e4bd2e2e8ffd31160476c450affe6629c
* | Merge "Camera3: Provide consumer usage flags to HAL for each stream"Eino-Ville Talvala2013-08-057-4/+42
|\ \
| * | Camera3: Provide consumer usage flags to HAL for each streamEino-Ville Talvala2013-08-057-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | At stream configure time, pass on the stream's consumer usage flags to the HAL, to speed up final hardware configuration. Bug: 9592202 Change-Id: Ie467be053be36a09e482f5f05cad65df42d66476
* | | Camera: fix the metadate parcel write issueZhijun He2013-07-311-4/+4
|/ / | | | | | | | | | | Also rename the frameId to requestId to make it less confusing. Change-Id: I14a20b6fcabb86294afb31fc0c56397e185c1373
* | Camera: Rename new API to camera2, rearrange camera serviceEino-Ville Talvala2013-07-3059-165/+187
| | | | | | | | | | | | | | | | | | | | | | - 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
* | Merge "camera2 api: Override default RGBx formats to IMPLEMENTATION_DEFINED"Igor Murashkin2013-07-291-2/+2
|\ \
| * | camera2 api: Override default RGBx formats to IMPLEMENTATION_DEFINEDIgor Murashkin2013-07-291-2/+2
| | | | | | | | | | | | | | | Bug: 9487482 Change-Id: I09d3b4e41454d350c4bc7b1f8e893c3dad655e73
* | | camera2: Implement ICameraDeviceUser::waitUntilIdleZhijun He2013-07-233-1/+27
|/ / | | | | | | | | | | Also fixed some logging typo Change-Id: Ib254bdb137dca10b12595c23aeb1c53097423425
* | Camera: ProCamera connect need support HAL3 deviceZhijun He2013-07-221-0/+1
| | | | | | | | Change-Id: Iae7e5f9e6387f61f1c4bbb91f75803fc1fdf2668
* | Merge "camera2: Fix request ID bug"Zhijun He2013-07-201-1/+1
|\ \
| * | camera2: Fix request ID bugZhijun He2013-07-191-1/+1
| | | | | | | | | | | | | | | | | | Wrong request id was pushed in request list. Change-Id: I55bf7ae84ca41eec79db1a81d2cde35beaa2a6b9
* | | Merge "update to new Consumer APIs"Mathias Agopian2013-07-205-10/+5
|\ \ \
| * | | update to new Consumer APIsMathias Agopian2013-07-165-10/+5
| |/ / | | | | | | | | | Change-Id: I3c5d4be2a2e8783fbf98b3e268fd02658f71dc7d
* | | am b0177ff2: am 46910bdc: Camera2/3: Fix deadlock when starting recording ↵Eino-Ville Talvala2013-07-197-89/+140
|\ \ \ | |/ / |/| | | | | | | | | | | | | | before preview. * commit 'b0177ff25e3e620be6ebe1e2c3f645b2f05dd57e': Camera2/3: Fix deadlock when starting recording before preview.
| * | Camera2/3: Fix deadlock when starting recording before preview.Eino-Ville Talvala2013-07-187-89/+140
| |/ | | | | | | | | | | | | | | | | | | Move 3A notification synthesis for HAL3 devices from Camera3Device::processCaptureResult to Camera2Client's FrameProcessor. This will ensure that calls to processCaptureResult from HAL can never block on Camera2Client internal mutexes. Bug: 9923891 Change-Id: I5184649bf45c0807babe6b8c0e1239e959cd3480
* | Merge "always pass the BufferQueue explicitely to consumers"Mathias Agopian2013-07-165-5/+10
|\ \
| * | always pass the BufferQueue explicitely to consumersMathias Agopian2013-07-125-5/+10
| | | | | | | | | | | | Change-Id: Ic2d9a9cf184a482b3c78a481ed693ee32df5ca13
* | | camera2: Implement ICameraDeviceUser::getCameraInfoIgor Murashkin2013-07-152-13/+6
|/ / | | | | | | | | Bug: 9529161 Change-Id: I927e39c124cd5fb19e38423506f4463acc381cb0
* | Merge "Pass additional arg to acquireBuffer calls."Andy McFadden2013-07-113-4/+4
|\ \
| * | Pass additional arg to acquireBuffer calls.Andy McFadden2013-07-083-4/+4
| | | | | | | | | | | | | | | | | | Bug 7900302 Change-Id: I30b9cca783e0a48f77035b745b7d5e20edf10f27
* | | am adaa78c9: am a2520db0: camera2/3: set preview callback oneshot flag ↵Zhijun He2013-07-111-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | during still capture * commit 'adaa78c901a2f2509965b7acc1cde848dfc6bafe': camera2/3: set preview callback oneshot flag during still capture
| * | camera2/3: set preview callback oneshot flag during still captureZhijun He2013-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview callback oneshot flag need set when a still picture is being captured and preview callback oneshot is enabled, otherwise, the callback enabling status could be lost when preview is restarted after still catpure. Bug 9742091 Change-Id: If9562369013e53727edfdd16f3d00d6a9392e70d
* | | am 06a4604e: am 4a5c009b: Camera2/3: As a fallback, unilaterally free old ↵Eino-Ville Talvala2013-07-082-14/+119
|\ \ \ | |/ / | | / | |/ |/| | | | | recording buffers * commit '06a4604e77b5872857ef95fe712b6ce00c7aa506': Camera2/3: As a fallback, unilaterally free old recording buffers
| * Camera2/3: As a fallback, unilaterally free old recording buffersEino-Ville Talvala2013-07-082-14/+119
| | | | | | | | | | | | | | | | | | | | | | When starting a recording session, check for and clear out recording buffers still owned by stagefright from a previous recording session, if any. There should never be any, but in case they are due to a bug elsewhere in the system, clearing out the buffers makes recovery possible. Bug: 9591080 Change-Id: I3a2a1256860bd174381cd525948419f985c9b415
* | Merge "Camera2Api: Creating a JPEG stream needs to use the right size"Eino-Ville Talvala2013-07-011-2/+17
|\ \
| * | Camera2Api: Creating a JPEG stream needs to use the right sizeEino-Ville Talvala2013-07-011-2/+17
| | | | | | | | | | | | | | | | | | | | | JPEG streams have variable size, so use the HAL-provided max size to size the stream buffers. Change-Id: Ie6900bc9ece6e972eae93fca6aca779224c9bfc6
* | | resolved conflicts for merge of 364a2677 to masterEino-Ville Talvala2013-06-282-32/+84
|\ \ \ | |/ / |/| / | |/ Change-Id: I21f23c1c5e4408c24c359bef6270dffce47a988d
| * Camera2/3: Don't allow recording and callbacks to coexist.Eino-Ville Talvala2013-06-272-29/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tear down conflicting streams when necessary. - Shut down callbacks if recording starts - Do not allow callbacks to start if recording is active Per the current camera API, recording and preview callbacks cannot be active simultaneously. However, the framework did not explicitly disallow this, and in fact left the streams configured once they were created, even if switching between the two operational modes. In addition, no guards existed for trying to enable both recording and callbacks at the same time. Bug: 9423825 Change-Id: I7d6e6114c2e14fcfb5299b4c72ad557895cbf4b8
* | Merge changes I5b2eeab2,I71568560Igor Murashkin2013-06-2510-45/+926
|\ \ | | | | | | | | | | | | | | | * changes: Make android.hardware.photography.Camera work on HAL3+ devices Initial implementation of android.hardware.photography.CameraDevice (service)
| * | Make android.hardware.photography.Camera work on HAL3+ devicesIgor Murashkin2013-06-207-19/+129
| | | | | | | | | | | | | | | Bug: 9213377 Change-Id: I5b2eeab28985f53dfcb7b8e3029930f5adcd74f5
| * | Initial implementation of android.hardware.photography.CameraDevice (service)Igor Murashkin2013-06-207-26/+797
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Verified preview streaming requests * Other things *should* work but unverified / unimplemented in client side Missing: * CameraService needs to return static camera info metadata Bug: 9213377 Change-Id: I71568560fcf18d0e2b408ed1c4d0066647314868
* | | camera2/3: Warn on missing active array size parametersAlex Ray2013-06-201-0/+2
|/ / | | | | | | Change-Id: I752659e1f0522392b902839cd7f4d997dcd85966
* | am 9c8714da: am e6478de7: Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
|\ \ | |/ | | | | | | * commit '9c8714daaf6a402abd85557e9b652c86f0df86e4': Camera2/3: Avoid shutdown race in callback processor.
| * Camera2/3: Avoid shutdown race in callback processor.Eino-Ville Talvala2013-06-191-1/+4
| | | | | | | | | | | | | | | | | | | | It's possible, during shutdown, for callback processor's heap to be destroyed when it's about to send the callback back to the user. Properly copy the heap reference to a local variable before unlocking the mutex. Bug: 9485959 Change-Id: I301347b77145f19c7ac721b9127dc74f122acce2
* | am bda5d1f2: am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
|\ \ | |/ | | | | | | * commit 'bda5d1f2a34f9b7ded0bc0441be4856e78ec066c': Camera3: Power: Properly shut down unused thread.
| * Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
| | | | | | | | | | Bug: 9466221 Change-Id: I9ed0740561b2e04954eebc1b8aec89cfab40a3a0