Igor Murashkin
28ecf8da88
Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE
...
This reverts commit 52f92faa60 .
2013-01-30 16:31:51 -08:00
Igor Murashkin
68ade37943
Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
...
Change-Id: I36c3dcaaecd9bca495c1476841a0ae338019e7eb
2013-01-10 11:58:14 -08:00
Igor Murashkin
95f1b7e72e
Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
...
Change-Id: I7574913a5e2b5d1bcdfede11d99a212ef01a8697
2013-01-10 11:58:14 -08:00
Igor Murashkin
0bddddb04d
Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE
...
Change-Id: I37e2c005607548c47e34e7e09994894a69f9e955
2013-01-10 11:58:14 -08:00
Igor Murashkin
74d45ce6f3
Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE
...
Change-Id: I12d960debb499795487582655243e951b15947d5
2013-01-10 11:58:14 -08:00
Igor Murashkin
04ff9ec118
Camera2: Fix a deadlock when closing the camera: DO NOT MERGE
...
Change-Id: I15dcf719aae4ed0dd3a46150ecba54ed6a7f31f5
2013-01-10 11:58:14 -08:00
Igor Murashkin
52f92faa60
Camera2: Selectively re-define master metadata symbols: DO NOT MERGE
...
Change-Id: I0d8637362f407dc2e2809d5800c9667f3c15260b
2013-01-10 11:58:06 -08:00
Eino-Ville Talvala
d6046a445f
EmulatedFakeCamera2: Add shim to work around FORMAT_ZSL.
...
Emulator does not need FORMAT_ZSL, so treat it as
IMPLEMENTATION_DEFINED.
Bug: 6243944
Change-Id: I9eeb48f6197ff9979f7823b8dc912346158fd6f1
2012-09-13 16:33:26 -07:00
Eino-Ville Talvala
46a65b42aa
EmulatedFakeCamera2: Split AE/AWB mode and lock
...
Bug: 6243944
Change-Id: Ib7d311a04c687358317164f7f711dc293ecc0519
2012-09-04 09:23:21 -07:00
Eino-Ville Talvala
4573a7194d
EmulatedFakeCamera2: Add precapture trigger and reprocess support
...
- Manage the precapture protocol with trigger/AE notifications
- Support reprocessing from opaque format to JPEG
- Add a bit of exposure variation to scene
Bug: 6243944
Change-Id: Ic88f8f0ea641ddaf3e921849caf79dd3838665f8
2012-09-04 09:23:21 -07:00
Eino-Ville Talvala
33c3f77760
EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
...
Stop using CAMERA2_HAL_PIXEL_FORMAT_OPAQUE.
Bug: 6243944
Change-Id: I96ea30228b126b4eed560a760269cb50bbbb62f7
2012-08-28 14:39:59 -07:00
Eino-Ville Talvala
eb502a31bc
EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size.
...
Change-Id: I5aa01501c36076a6260d47d2ae4bdc0365b49a8c
2012-08-28 13:40:46 -07:00
Eino-Ville Talvala
cb5703d5ea
EmulatedCamera2: Improve thread sequencing
...
- When the readout thread is the slow point, frames could be dropped
in various ways. Add signals to slow down the configure thread and
the sensor when the readout thread is behind.
- Clean up verbose logs to be clearer
Bug: 6243944
Change-Id: I2efb909f03183273a71dc7edede3aa107117f558
2012-08-20 11:05:01 -07:00
Eino-Ville Talvala
ae031a1aea
EmulatedFakeCamera2: Add face detection support.
...
Bug: 6243944c
Change-Id: Ice45571b44af2975cc699e4e8b95fb170a889117
2012-08-13 09:40:14 -07:00
Eino-Ville Talvala
f856a82b87
EmulatedFakeCamera2: Add autofocus management
...
- Add skeleton ControlThread for 3A processing
- Add fake autofocus management into ControlThread
- Support AUTO, MACRO, CONTINUOUS_PICTURE, CONTINUOUS_VIDEO
Bug: 6243944
Change-Id: Ic47f5be642d4705db86021b94aaba8dcc7f32cf0
2012-08-08 10:43:37 -07:00
Eino-Ville Talvala
05940c4d69
Camera2: Use lower resolutions for front fake camera. DO NOT MERGE
...
To differentiate front/back fake camera, support a lower set of
resolutions for the front camera processed and jpeg streams.
Bug: 6243944
Change-Id: I4a8746500944f7b445e0e5f0a3f441885733a7a4
2012-07-26 10:04:38 -07:00
Eino-Ville Talvala
1e903b0745
Camera2: Fix deadlock issues with getInProgressCount. DO NOT MERGE
...
Bug: 6243944
Change-Id: Icb32e4b8c4a916eb7c97ac18767cadfc5122ec88
2012-07-26 10:04:16 -07:00
Eino-Ville Talvala
b0bd05236f
EmulatedFakeCamera2: Add recording support for 320x240, NV21. DO NOT MERGE
...
- Support 320x240 in addition to 640x480
- Support NV21 (monochrome only right now)
- Base simulated time on system time,
since stagefright cares about timestamp base
- Use emulator magic gralloc format to enable gralloc to pick format based on
destination.
Bug: 6243944
Change-Id: I3ea56bca726c69b51e03233ce86d4881401a3ffd
2012-07-26 10:03:35 -07:00
Eino-Ville Talvala
9f3517e96f
EmulatedFakeCamera2: Use correct camera orientation.
...
Get orientation from the camera factory; otherwise preview is
displayed incorrectly.
Bug: 6243944
Change-Id: Icb27a53ad333109a62dce012216aca67e3e881b8
2012-06-15 13:15:55 -07:00
Eino-Ville Talvala
cc588adda3
EmulatedFakeCamera2: Implement basic dump()
...
Bug: 6243944
Change-Id: I84696ea79f8c36d34c2cccdac259c9baba048c1f
2012-06-14 10:52:04 -07:00
Eino-Ville Talvala
e26e64f2de
EmulatedFakeCamera2: Add support for JPEG output, multiple streams
...
Required to support Camera.takePicture()
Bug: 6243944
Change-Id: I60d7a161a7037c25428eac5a6f9327aff47da584
2012-06-13 12:08:28 -07:00
Eino-Ville Talvala
423650c32c
EmulatedFakeCamera2: Minor fixes
...
- Add some error checking
- Change default exposure/gain to avoid overexposure.
- Improve gain calculation for RGBA output
Bug: 6243944
Change-Id: Iaa9f35e0b62883a947cc9e63f86d0ec3ae828576
2012-06-08 09:52:38 -07:00
Eino-Ville Talvala
c7bb6cf132
EmulatedFakeCamera2: Add opaque stream output support
...
- Enables basic preview
- Opaque is RGBA for emulator
- Still only 1 stream max
- Preparations for YUV output support
Bug: 6243944
Change-Id: I11cb494d72c7c2ec5f542c79f1aa15d9a3ce00bf
2012-05-22 10:38:56 -07:00
Eino-Ville Talvala
7b906a7ca9
EmulatedFakeCamera2: Add more static metadata
...
- Add entries for all metadata
- Use better idiom for static metadata construction
- Revise dynamic and static metadata
- New resolution reporting
- Minor revision to some enums
- Quiet excess logging
Bug: 6243944
Change-Id: I0558d7d60ae97d2df9e209f24c1e04330737c220
2012-05-21 14:10:25 -07:00
Eino-Ville Talvala
366eef524c
EmulatedCamera2: Be more const, like the HAL.
...
Bug: 6243944
Change-Id: I01f67c22b6e54dc49f22c6bc2c665b1db4ff6680
2012-05-20 17:04:27 -07:00
Eino-Ville Talvala
ab463b3ece
EmulatedFakeCamera2: Support construct_default_request HAL method.
...
Bug: 6243944
Change-Id: I888fefae0b08532862171323774808cf241cdad1
2012-05-15 14:56:54 -07:00
Eino-Ville Talvala
bb54bb03ec
EmulatedFakeCamera2: Update to match camera_metadata changes
...
Bug: 6243944
Change-Id: I3ff301829827b7e694c371efe7915667d9a66493
2012-05-14 18:08:18 -07:00
Eino-Ville Talvala
61fbf61670
Add minimal operation to new fake camera emulator.
...
- Rework to match latest camera 2 HAL.
- Somewhat realistic scene lighting simulation, for allowing a
realistic range of exposure and gain values.
- Supports raw Bayer sensor data only, at 640x480
- Only one stream configurable
- No support for reprocessing, 3A, flash, YUV, JPEG, etc
Bug: 6243944
Change-Id: I14fbad58ffeff37162c56d9daff7e4f75ab879c3
2012-05-10 16:23:28 -07:00
Eino-Ville Talvala
0819e42a0b
Add skeleton implementation of a fake v2 camera device.
...
Change-Id: Idd2485064548a6036ea318680065b7429463d9cd
2012-04-17 10:05:17 -07:00
Eddy Talvala
ee16c8342b
Revert "Revert "Multi-project commit, other commits weren't ready after all. (Revert)""
...
This reverts commit a1e84accb5
2012-04-17 09:12:39 -07:00
Eddy Talvala
a1e84accb5
Revert "Multi-project commit, other commits weren't ready after all. (Revert)"
...
This reverts commit f3785f1414
2012-04-05 18:06:40 -07:00
Eddy Talvala
f3785f1414
Multi-project commit, other commits weren't ready after all.
...
Revert "Add skeleton implementation of a fake v2 camera device."
This reverts commit 5a35e724fc
2012-04-05 16:45:02 -07:00
Eino-Ville Talvala
5a35e724fc
Add skeleton implementation of a fake v2 camera device.
...
Change-Id: I46df945117adef8d5c03846b1dd29435fa4c7d46
2012-04-05 16:04:29 -07:00