Commit graph

880 commits

Author SHA1 Message Date
Eric Laurent
099e61508e audio effects: fix link problem with NULL UUID
A special value for NULL effect UUID is declared as const
in audio_effect.h. This prevents several modules including
audio_effect.h to be linked together.

The fix consists in declaring the value as static const.

Change-Id: I86e74dc9da8eaed13a3ad44765abb9cd1e80f316
2013-02-07 11:35:29 -08:00
Mathias Agopian
e3e0a570a8 add support for plane-alpha in HWC
Change-Id: Ied228e689ca892c505fbd811fd2b8579287e4ac6
2013-02-04 20:47:13 -08:00
Igor Murashkin
efa40942bf am 46e9befb: (-s ours) am 4c645d0a: Camera2: Fix metadata symbols: DO NOT MERGE
# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit '46e9befbe45e0d53c7ad1cb0f570865c08335aab':
  Camera2: Fix metadata symbols: DO NOT MERGE
2013-01-30 18:59:47 -08:00
Igor Murashkin
16fba27651 am e0731653: (-s ours) am 803a8c76: Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE
# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit 'e073165389625fcb54c4d6b2565a6ada2d125048':
  Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE
2013-01-30 18:59:47 -08:00
Igor Murashkin
46e9befbe4 am 4c645d0a: Camera2: Fix metadata symbols: DO NOT MERGE
# Via Igor Murashkin
* commit '4c645d0a9bd4721fe65f1c2264fed7a5830428a2':
  Camera2: Fix metadata symbols: DO NOT MERGE
2013-01-30 18:57:20 -08:00
Igor Murashkin
e073165389 am 803a8c76: Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE
# Via Igor Murashkin
* commit '803a8c76c532f1548425fc1a3d3d9d04554b29f3':
  Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE
2013-01-30 18:57:19 -08:00
Igor Murashkin
4c645d0a9b Camera2: Fix metadata symbols: DO NOT MERGE
Change-Id: I5d7c8416b8ed8effca699aa9e51068f5678927ea
2013-01-30 16:35:09 -08:00
Igor Murashkin
803a8c76c5 Revert "Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE": DO NOT MERGE
This reverts commit 4ac84a428d.
2013-01-30 16:33:31 -08:00
Mathias Agopian
2f276f5550 renamed sensor PEDOMETER to STEP_DETECTOR
pedometer was confusing.

Change-Id: Ib40c8034e9038f7153299aed4ee33a0a9f1e900e
2013-01-28 17:54:41 -08:00
Jesse Hall
1df68b42ca am c4f18ad3: am af05c912: am a8c06116: Merge "Remove remnants of HWC 0.x"
* commit 'c4f18ad3bfcd9c4d8867ee3b366ed24f13371c47':
  Remove remnants of HWC 0.x
2013-01-14 09:53:43 -08:00
Jesse Hall
c4f18ad3bf am af05c912: am a8c06116: Merge "Remove remnants of HWC 0.x"
* commit 'af05c912e1afa1f7d7b3f4b1d8b3034427abc37b':
  Remove remnants of HWC 0.x
2013-01-14 09:51:22 -08:00
Jesse Hall
af05c912e1 am a8c06116: Merge "Remove remnants of HWC 0.x"
* commit 'a8c061169752cbaf335a35e49568b7fe7d7e83cd':
  Remove remnants of HWC 0.x
2013-01-14 09:49:11 -08:00
Jesse Hall
a8c0611697 Merge "Remove remnants of HWC 0.x" 2013-01-14 09:25:00 -08:00
Igor Murashkin
926d1f7a4b am efabd3c6: (-s ours) am 2dc781d2: Camera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE
* commit 'efabd3c6c6c0e0ca0625dadf1d4a2ed00c2d0a21':
  Camera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE
2013-01-11 10:54:12 -08:00
Igor Murashkin
1c2e91c1b7 am 85f18a15: (-s ours) am 2d3c3e14: Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE
* commit '85f18a15b1375c4d59b93f4dac1d4b5995854fe6':
  Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE
2013-01-11 10:54:12 -08:00
Igor Murashkin
469df52492 am 1af4dc05: (-s ours) am f32c9ea6: Camera2: Tests: Ignore V1 device initialization failures.: DO NOT MERGE
* commit '1af4dc058ef26804cc3617e1ec4a80cc9e1ad715':
  Camera2: Tests: Ignore V1 device initialization failures.: DO NOT MERGE
2013-01-11 10:54:11 -08:00
Igor Murashkin
d05b32c5d7 am e5326c29: (-s ours) am 1f51808a: Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE
* commit 'e5326c296fe91b7ae7d43d00def34d22dc8e5771':
  Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE
2013-01-11 10:54:10 -08:00
Igor Murashkin
c33274129a am 32b9b9ff: (-s ours) am d8875030: Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE
* commit '32b9b9ff9ae2f367ad3626690d6ef1fd9339e423':
  Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE
2013-01-11 10:54:09 -08:00
Igor Murashkin
caf5614b44 am 5a6b76d2: (-s ours) am 2a5c0e2a: Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE
* commit '5a6b76d2ae1e6da5929a6f475fada31b280a2360':
  Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE
2013-01-11 10:54:08 -08:00
Igor Murashkin
0e397d3adb am be3b59c4: (-s ours) am ff4d762c: Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE
* commit 'be3b59c46e1fd6050bcc743202fcd6d109125701':
  Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE
2013-01-11 10:54:08 -08:00
Igor Murashkin
02b7d5ee72 am 3739a345: (-s ours) am afdd2b62: Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE
* commit '3739a345b688e89ae28145683c50590cc168b480':
  Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE
2013-01-11 10:54:07 -08:00
Igor Murashkin
cf19b88cab am 16e5a644: (-s ours) am 4ac84a42: Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE
* commit '16e5a6440f54b396219315bc27f49f103083393b':
  Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE
2013-01-11 10:54:06 -08:00
Igor Murashkin
6797445d55 am f6892043: (-s ours) am 919cf643: Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
* commit 'f68920430b5dd669f89e9a0f74b095229fddf42c':
  Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
2013-01-11 10:54:04 -08:00
Igor Murashkin
d18541862e am 4c4b2a91: (-s ours) am 7e38f5fa: Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
* commit '4c4b2a9120c59ed8172a0e94b4410e8f5c3143e3':
  Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
2013-01-11 10:54:03 -08:00
Jesse Hall
71b9c1fab9 Remove remnants of HWC 0.x
Change-Id: I85f4b95e8db44998abc07686a554d3e802a6a4a9
2013-01-10 18:17:14 -08:00
Igor Murashkin
efabd3c6c6 am 2dc781d2: Camera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE
* commit '2dc781d20e8321aada3e8f46f76414c8dd3229da':
  Camera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE
2013-01-10 13:37:15 -08:00
Igor Murashkin
85f18a15b1 am 2d3c3e14: Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE
* commit '2d3c3e145545f0920f38340a8702d39e5ae8a792':
  Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE
2013-01-10 13:37:14 -08:00
Igor Murashkin
1af4dc058e am f32c9ea6: Camera2: Tests: Ignore V1 device initialization failures.: DO NOT MERGE
* commit 'f32c9ea6dfa86904fff4935ee0ffe989c4297b39':
  Camera2: Tests: Ignore V1 device initialization failures.: DO NOT MERGE
2013-01-10 13:37:14 -08:00
Igor Murashkin
e5326c296f am 1f51808a: Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE
* commit '1f51808ad12e52b44097b4bbe0cfb454ed21687f':
  Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE
2013-01-10 13:37:13 -08:00
Igor Murashkin
32b9b9ff9a am d8875030: Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE
* commit 'd887503095926eadfefefdc07fcedaff51e4f07d':
  Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE
2013-01-10 13:37:12 -08:00
Igor Murashkin
5a6b76d2ae am 2a5c0e2a: Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE
* commit '2a5c0e2a466fe5252cd12c0199d4868efcc83264':
  Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE
2013-01-10 13:37:11 -08:00
Igor Murashkin
be3b59c46e am ff4d762c: Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE
* commit 'ff4d762c34e2f785a01f7d2253d746d0bcdc7aa4':
  Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE
2013-01-10 13:37:11 -08:00
Igor Murashkin
3739a345b6 am afdd2b62: Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE
* commit 'afdd2b621140f90c2df1a161ed36e42caa2d26da':
  Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE
2013-01-10 13:37:10 -08:00
Igor Murashkin
16e5a6440f am 4ac84a42: Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE
* commit '4ac84a428d05ce7963f201df7ca308acb88fd8d8':
  Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE
2013-01-10 13:37:09 -08:00
Igor Murashkin
f68920430b am 919cf643: Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
* commit '919cf643730fe7aacbbbaf014f2dfbf47521ecfa':
  Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
2013-01-10 13:37:08 -08:00
Igor Murashkin
4c4b2a9120 am 7e38f5fa: Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
* commit '7e38f5faac9a8404bd13ea02cf136f1a69443715':
  Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
2013-01-10 13:37:07 -08:00
Igor Murashkin
2dc781d20e Camera2: Tests: ModuleTests should not return OK for bad indices: DO NOT MERGE
Change-Id: Ie2a0558104c13fe881d90ababf66a54f810f12aa
2013-01-10 11:46:23 -08:00
Igor Murashkin
2d3c3e1455 Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE
- Requests were missing control type (capture vs reprocess)
- Not waiting for streams to be drained before disconnecting (sporadic fails)

Change-Id: Icaf88287344e98138b22afcd14b9f1878cdffa47
2013-01-10 11:46:20 -08:00
Igor Murashkin
f32c9ea6df Camera2: Tests: Ignore V1 device initialization failures.: DO NOT MERGE
This allows CameraModuleTests.LoadModule and GetCameraInfo to pass.

Change-Id: I0489ef996b5caf3e97bb71ef8c2502b0ee4d7ec3
2013-01-10 11:46:16 -08:00
Igor Murashkin
1f51808ad1 Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE
Producer would wait for buffers to be released so it could dequeue into them.
Since the test never acquired/released buffers, it would run out, and then
the HAL would deadlock when trying to shutdown since the producing thread
would never finish.

Change-Id: I123f36d87a2e72a2c42d942c975c02b8bd3f9f1a
2013-01-10 11:46:11 -08:00
Igor Murashkin
d887503095 Camera2: Tests: Release streams after HAL is unloaded: DO NOT MERGE
This fixes a segfault in the HAL where it was trying to write to a locked buffer
that disappeared from underneath it.

Any users of CameraModuleFixture should now call SetUp/TearDown explicitly.
Other classes remain unchanged until we need a custom TearDown order for them.

Change-Id: Ia2dc3ac3e2497d9ede9b580f6e10cf9ec646bdab
2013-01-10 11:46:06 -08:00
Igor Murashkin
2a5c0e2a46 Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE
Change-Id: I0c0d6c639ee3b0fe625d0888cca4486da9e2bb98
2013-01-10 11:45:56 -08:00
Igor Murashkin
ff4d762c34 Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE
Change-Id: I3c9133f74ef88dfdf10eb2c28760fc4acba8eb2f
2013-01-10 11:45:53 -08:00
Igor Murashkin
afdd2b6211 Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE
Change-Id: Ib7c706a0d1f2d917d01397efe55b7e45035cb252
2013-01-10 11:45:51 -08:00
Igor Murashkin
4ac84a428d Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE
Change-Id: I4010311d32a9c57790653b6c4ef0f51bfe24f853
2013-01-10 11:45:47 -08:00
Igor Murashkin
919cf64373 Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
Use CAMERA2_TEST_FORKING_DISABLED=1 environment variable to override this
behavior (e.g. when wanting to attach gdb to the test app).

Change-Id: I3696243825901e5c7a7e4d0515831e76ae47ef4f
2013-01-10 11:45:43 -08:00
Igor Murashkin
7e38f5faac Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
Change-Id: If5c922a0c0139b90c4781f022d80f7b9a0932e9e
2013-01-10 11:45:38 -08:00
Alex Ray
ed6b8a7710 modules: camera: Add tracing
Change-Id: I00ee447e6b57bc57fd09b6e7d8c62cb07cb37cf0
2013-01-03 21:06:27 -08:00
Alex Ray
a48dd3fb34 modules: camera: Defer documenting API
Avoid duplicating the api docs in the example HAL, instead point to
canonical source for them.

Change-Id: If3f5acb7a73260248bd00ce01cb1c80f230f7188
2013-01-03 21:06:17 -08:00
Jean-Michel Trivi
2fb1aab256 Merge "Use strong pointers and scope" 2012-12-26 09:12:18 -08:00