Commit graph

186 commits

Author SHA1 Message Date
Ruben Brunk
b35bee2a90 Fix build. Missing vendor tags header. 2014-01-17 14:48:19 -08:00
Ruben Brunk
61cf9eb920 camera3: Update vendor tag spec for HAL 3.2.
- Deprecates vendor tag specification in camera3 device.
- Moves vendor tag ops declaration to camera metadata library and
  cleans up definitions.
- Updates the example HAL.

Change-Id: Ifb16bb0d4bbc896bc32d33dd150e7e174af57dad
2014-01-16 18:27:08 -08:00
Alex Ray
215913e370 Merge "modules: camera: replace pthread mutex with utils'" 2013-12-05 22:17:07 +00:00
Rom Lemarchand
2955fe2083 am e735e5fa: am 047510b1: Merge "gralloc: delete unused mutex declaration"
* commit 'e735e5fa42f62d856e6c86d7ee785bb9797b6750':
  gralloc: delete unused mutex declaration
2013-11-27 10:32:10 -08:00
Rom Lemarchand
0287721d28 gralloc: delete unused mutex declaration
Change-Id: Ibc7e70887b61f7dd885c86d412387636d3a6a867
2013-11-26 10:01:25 -08:00
The Android Open Source Project
bae5cf92cf Merge commit 'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0' into HEAD 2013-11-22 10:35:26 -08:00
Aaron Whyte
22bf9724a1 Removed unneeded linux/input.h includes, to fix Mac SDK build
Change-Id: I3bcfadb9c95a9239d8098989c60d5604bfdfb66f
2013-11-14 19:15:25 -08:00
Aaron Whyte
97b3fe17c9 deactivated multihal logspam, made warnings warnings, left critical startup info
Change-Id: I6a53cef28ab87ca0d7f4668070e4d93ff726cf0d
2013-11-14 11:25:10 -08:00
Aaron Whyte
c69f3a70ec Tests SensorEventQueue I/O when the queue is full.
Reduced debug logging in multihal.

Change-Id: I30e80630ce5d97776c53f26d6096ef59b9b2f35a
2013-11-14 11:25:00 -08:00
Aaron Whyte
92863c14b7 MultiHal multithreaded polling
Change-Id: I3ebe380169eed1c8deeca2860d1788be6c14837e
2013-11-14 11:24:51 -08:00
Aaron Whyte
ab6ec384c4 Added a SensorEventQueue, a circular buffer meant for reading with one thread
and polling a subhal with another. The writing thread gets access to pointers
in the internal buffer. This design avoids a memcpy on write when the multihal
fetches subhal events using poll().

Unit-tests include multithreaded reading and writing lots of events, in
random-sized chunks.

This is not used by the multihal yet. That will be a different CL.

Change-Id: I58418d69eebebeb96befb08ba3aed080f0f08551
2013-11-14 11:24:15 -08:00
Mike Lockwood
079083281e Move sensors multi HAL to libhardware
Change-Id: I12ba76291990264a2db61069f9610c40e96a9695
2013-11-14 11:21:46 -08:00
Alex Ray
555676430e modules: camera: replace pthread mutex with utils'
Change-Id: Id974e4cc743d27d59634023cfdbba545fbb64e5f
2013-11-12 18:32:51 -08:00
Nick Kralevich
375f4e3bfb am 15f0d47d: am af822c43: Merge "gralloc: do not use GNU old-style field designators"
* commit '15f0d47dc6611150be34bc98a8f328df53c93397':
  gralloc: do not use GNU old-style field designators
2013-11-06 19:42:41 -08:00
Nick Kralevich
15f0d47dc6 am af822c43: Merge "gralloc: do not use GNU old-style field designators"
* commit 'af822c43cf144a991db49d8c25068d054265ae37':
  gralloc: do not use GNU old-style field designators
2013-11-06 19:40:57 -08:00
synergy dev
6abbed5093 gralloc: do not use GNU old-style field designators
Avoiding the use of gnu extensions improves code portability

Change-Id: Icf8e3d4813bcddff40548bb5e65e615f8697b75c
2013-11-06 17:29:22 -08:00
Alex Ray
62735086ed modules: camera: Metadata refactor
Add* functions const to protect data being added.
Initiailze metadata object from a camera_metadata_t.
Remove template-specific constructor.
Add convenience "add1" method to abvoid stack-allocated data.
Construct templates manually (in ExampleCamera) from base.

Change-Id: I3201f61e9d32841ea7a769d69242b40d8727c02e
2013-10-28 14:40:28 -07:00
Alex Ray
69f1f9166a modules: camera: dump device and stream state
Change-Id: Iae3badba71f13784dfdd65d6e77b20283437935a
2013-10-21 12:21:08 -07:00
Alex Ray
7915e97d63 modules: camera: add vendor tag functionality
Vendor Tag operations were added in module api v2.2

Change-Id: I352a50759d8bb9389d904bb774659e4be883794b
2013-10-21 12:20:41 -07:00
Alex Ray
61f7a0c1c1 modules: camera: Abstract device-specific camera
ExampleCamera represents a specific (e.g. front or back) camera device,
and contains all the device and logic for that device/sensor.

Change-Id: Iecc1a1d905501a66edb6e3994ff93d8761b82f8b
2013-10-17 16:50:48 -07:00
Alex Ray
3e8a9fe5e0 modules: camera: Add android.jpeg.maxSize metadata
Change-Id: I0984b55df0adf8c60b07844003e97b5aac8ece3f
2013-10-14 15:58:02 -07:00
Alex Ray
ea80382be1 modules: camera: Update trace headers to libutils
Now that libutils is outside of frameworks, use that for c++-style
scoped tracing and remove the temporary shim header.

Change-Id: I913767aed8ff70abb9299e7a7b318b24a25e23c1
2013-10-14 15:56:43 -07:00
Alex Ray
d9d105a0ce consumer_ir: add array length to get carrier freq
Change-Id: Iefb424db6f16ffefa40da56c765c9b7a24bea397
2013-09-11 17:51:19 -07:00
Alex Ray
09875a2eab modules: add demo consumer IR HAL
Change-Id: Iaae40c06af0dc008429d5dee4f45dc0b156957a1
2013-09-09 23:55:26 -07:00
Glenn Kasten
59caeb14a7 Merge "Fix file permissions" into klp-dev 2013-08-22 22:26:35 +00:00
Eric Laurent
9595f7cff6 remote submix: fix test on sampling valid rates
Change-Id: I4e9e378940bb56202a6e6882f561b3293ad7225d
2013-08-22 10:25:22 -07:00
Glenn Kasten
08708c5e1f Fix file permissions
Change-Id: Iffc2941d98ee16796cf3d44dec1cfa376d9362bb
2013-08-20 12:49:27 -07:00
Alex Ray
0f82f5a73a modules: camera: Separate locking for static characteristics
Static camera characteristics can be queried on any device at any time.
Separate the locking for it from the rest of the device to eliminate any
contention between operations on the device and static characteristic
initialization.

Change-Id: I8076378699f274e70c6318e537df4758972de9db
2013-07-26 16:36:43 -07:00
Mathias Agopian
ba9c8badb7 get rid of HAL pixelformats 5551 and 4444
Change-Id: I196ee30ed57707ed4cc46fb3a9c5c07c5bac6fff
2013-07-26 16:23:33 -07:00
Eric Laurent
ad3f4624b4 Merge "Code changes for offload support in hardware libhardware" 2013-07-25 21:15:23 +00:00
Zhijun He
bd1468921e modules: camera: Fix build break due to metadata change
Change-Id: I085796569ea77336d32907ee2287ff7533b0c122
2013-07-18 17:59:30 -07:00
Richard Fitzgerald
072a79d3e4 Code changes for offload support in hardware libhardware
Change-Id: Icfe9bf4b4768bbdcb11e6c77ac26163018f9c7c8
2013-07-18 09:23:27 -07:00
Alex Ray
9cd49c9c4e modules: camera: simplify metadata list traversal
keep traveling pointer local to the walking loop

Change-Id: I0038007d6e7a45e519b9b2162c674132477879cc
2013-07-09 12:59:42 -07:00
Alex Ray
764e442baf modules: camera: Shutter notify message support
The shutter callback timestamp should originate from the sensor itself,
since it knows exactly when the first line of the frame started
exposing.  However, as a fallback (or in the CPU-painting case) query
CLOCK_BOOTTIME instead.

Change-Id: Id57c05525e9c575d009b9deb96a69557fccac16b
2013-07-09 12:19:04 -07:00
Alex Ray
90c0af71f6 modules: camera: make Metadata a delete-able object
Metadata is currently only used for immutable persistent settings
(static camera characteristics, and the capture templates), but will be
used for dynamic metadata as well.  Make it deleteable so we can
create/destroy these at will.

Change-Id: I7372b07b904d5a6b55453093712e0bb2675918b5
2013-07-03 14:32:59 -07:00
Alex Ray
77ecfd76d7 modules: camera: only wait on valid acquire fence
Change-Id: I4f51e509d86722c18308f4f1312ca3379cffd795
2013-07-03 14:32:59 -07:00
Alex Ray
2b286dab84 modules: camera: Write back stream parameters
max_buffers and usage are read by the framework inside the struct used
to pass the stream configuration parameters;  scribble our new
calculated values whever they are updated internally.

Adds logging to stream creation method (reuse/new).

Change-Id: I04e12880820571900f2ae80c27100f8aedcf9d02
2013-07-03 18:01:54 +00:00
Alex Ray
768216ee2c modules: camera: Fix stream type characterization
Type is now enum, not mask.

Change-Id: I264da26a457957a7659154e507970e0303c76e25
2013-07-03 18:00:21 +00:00
Alex Ray
0d2a5220ba modules: camera: Dirty metadata objects on update
Change-Id: I4fbd4ad919b855168e3ff5424613271b1fa907af
2013-07-03 10:55:04 -07:00
Alex Ray
89a82661e0 modules: camera: default request templates
Change-Id: I0a4b389e1850c10e12a65b3c8a5670c78c6746f7
2013-07-02 15:47:50 -07:00
Alex Ray
c6bf2f291d modules: camera: fix compiler warnings
Change-Id: Id1aa624d377776a7e37b52978664d30c927595be
2013-06-28 21:07:42 +00:00
Alex Ray
b0be1039c1 modules: camera: add get_camera_info support
Basic static metadata statically constructed from preprocessor passes
over an array of camera metadata tags.

Change-Id: I16ea9f4d68120d5a0bc010a4a67b0cbcd761329e
2013-06-28 13:52:50 -07:00
Alex Ray
083315c85b modules: camera: No-op result submission with request
Change-Id: If4e377ba0ac327cc02ac2b9765ce5d406b8960a8
2013-05-29 03:39:00 +00:00
Alex Ray
11bbeefaf9 modules: camera: Input buffer reprocessing scaffolding
Change-Id: I158ba833549aee47ca3be5673f6f5d33e455ef59
2013-05-29 03:38:20 +00:00
Alex Ray
bfcbd95a1f modules: camera: memoize request settings metadata
Change-Id: I19c3a6a55a42e60f627702cd4a995664a0dfc4d2
2013-05-29 03:36:19 +00:00
Alex Ray
8a8f86bbe6 modules: camera: Add buffer registration scaffold
Change-Id: Ic1d20dd7f93a0ca3cd2c3af3b33a7a9df47b5e89
2013-05-13 19:47:47 +00:00
Alex Ray
bcaf788434 modules: camera: Add Streams
Adds a Stream object, and configureStreams support in parsing the
provided stream_array. Streams are naively setup for sync-less software
painting.

Change-Id: Ibbd90e3e2c7fa984dd5d2dcbd4da7bf4dad43aa1
2013-05-03 12:16:18 -07:00
Alex Ray
c16e56dd43 modules: camera: Add scoped trace helper
This c++ helper class is normally provided by frameworks/native's
libutils, but cannot be used from the context of a hardware module.  For
now just add the required functionality locally in the hardware module.

Change-Id: I5b399cbeb1c017a95baf19456dbf20569e677fbe
2013-04-29 14:16:57 -07:00
Alex Ray
005c9da544 modules: camera: remove unused variable
Change-Id: Ic21cd58a750411167ef4b060e8d3abc295edc83d
2013-04-29 14:16:57 -07:00
Alex Ray
af3a4617b4 modules: camera: fix dump log message
Change-Id: I2511653b3d2d21d03785ea220c760e2b65f0b035
2013-04-29 14:16:27 -07:00