Commit Graph

1194 Commits

Author SHA1 Message Date
Siva Velusamy
a4d9ccb36a Disable proguard for emulator tests
Change-Id: I3aeb201d2c9f5e51933d2284845ce42d3b477ee2
2013-05-23 14:24:12 -07:00
keunyoung
e39f0b3ea1 move emulator HALs to device/generic/goldfish
Change-Id: I1ff304d540c75c4d27c5fddeb7315e177d366fb3
2013-03-11 10:55:13 -07:00
Ying Wang
b74c3ef70b am f39c1088: am 7b9e308b: Merge ""debug" in those modules is discouraged"
* commit 'f39c1088f08e194a212f55a246bac85036f62a42':
  "debug" in those modules is discouraged
2013-03-07 17:32:46 -08:00
Ying Wang
75ac6f2897 "debug" in those modules is discouraged
Because we need those modules for only emulator builds.
If you mark them as "debug", you'll get them even if you are doing a
real device userdebug/eng build.
Instead, we should add their module names to the emulator product config
in build/target/product/emulator.mk.

Bug: 8276818
Change-Id: I58988ce49804583b06e7d93380c44ba800448216
2013-03-01 09:49:44 -08:00
Jesse Hall
843ea83d9c Merge "Fix glShaderSource parameter constness" 2013-02-23 04:56:37 +00:00
Jesse Hall
a0579871af Fix glShaderSource parameter constness
Change-Id: I1008d779a9d333dc8968812d22e387b804e3c570
2013-02-15 14:19:35 -08:00
James Dong
b92e9cdd21 Make software vp8 video encoder available to MediaCodec on emulator
Change-Id: I7da75ea335c0b07df876de473545f170138c56b7
2013-02-13 10:13:20 -08:00
Mathias Agopian
6e263d5568 clean-up sensor emulation code.
don't blindly access the "status" field which is not used for all sensors.

Change-Id: I6ff80cf37b8feeccddfd843480db1861aabbedf1
2013-02-06 18:57:04 -08:00
Igor Murashkin
bbbc646d85 EmulatedCamera2: Fix metadata symbols: DO NOT MERGE
Change-Id: I9ccec2636d73684af9236d873a6bba0e15cd598a
2013-01-30 16:32:56 -08:00
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
50a86be055 Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
This allows CameraModuleTest.LoadModuleBadIndices and
CameraModuleTest.GetCameraInfoBadIndices to pass.

Change-Id: I8db9d918e7773ccb1eece860b461aa0192782a3b
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
Igor Murashkin
2c0ee4a222 Camera2: Fix segfault when control fields were omitted in metadata
Change-Id: Ia13e7985211e44b5489624ac186e519925a40f26
2012-12-20 16:56:59 -08:00
Igor Murashkin
572a086038 Camera2: Test: fix deadlock in isStreamInUse
Change-Id: I2ac46303e96c3ccaaa0f76555b89bbeed45a3919
2012-12-20 16:56:34 -08:00
Igor Murashkin
09167dc112 Camera2: Return -ENODEV for camera indices out of bounds
This allows CameraModuleTest.LoadModuleBadIndices and
CameraModuleTest.GetCameraInfoBadIndices to pass.

Change-Id: Iffc658b256642ea0684fd8ad864fd273829bb35d
2012-12-20 16:56:20 -08:00
Igor Murashkin
871e2f54ab Merge "Camera2: Turn off 3A when android.control.mode == OFF" 2012-12-18 14:25:50 -08:00
Igor Murashkin
37f8f607c1 Merge "Revert "Camera2: Fix a potential race condition in the readout thread"" 2012-12-18 14:22:25 -08:00
Igor Murashkin
6d305d0183 Camera2: Turn off 3A when android.control.mode == OFF
Change-Id: Ie6a8726e14529a8605b9ecae6adfa705e79df00a
2012-12-14 14:17:36 -08:00
Igor Murashkin
c4464b7fee Revert "Camera2: Fix a potential race condition in the readout thread"
The last fix incorrectly added a mutex lock which did not guard the appropriate
variables.

In fact it actually *introduced* a new race condition in a HAL test.

This reverts commit 6edd7ab4a4.
2012-12-14 14:17:36 -08:00
Igor Murashkin
f1b72a3757 Merge "Camera2: Fix a potential race condition in the readout thread" 2012-12-12 12:47:58 -08:00
Igor Murashkin
52f7c8d4c6 Merge "Camera2: Fix a deadlock when closing the camera" 2012-12-12 12:47:47 -08:00
Igor Murashkin
6edd7ab4a4 Camera2: Fix a potential race condition in the readout thread
Change-Id: Ie4475c8433eaad7545430f7e01e222d074180e0e
2012-12-07 12:34:20 -08:00
Igor Murashkin
0825f8b65b Camera2: Fix a deadlock when closing the camera
Change-Id: I8b6be364ca90b0eed62ae03c1548680c0b2f0e64
2012-12-07 12:32:00 -08:00
Igor Murashkin
53db6a1a21 Merge "EmulatedCamera2: Fix metadata symbols" 2012-12-04 17:26:39 -08:00
Igor Murashkin
328bdf979a EmulatedCamera2: Fix metadata symbols
Change-Id: I9ccec2636d73684af9236d873a6bba0e15cd598a
2012-11-30 14:13:09 -08:00
Marco Nelissen
6cebef011f Add gsm decoder to media codec list
b/6620569

Change-Id: I9c41bd34e931bb59405146931dfc12a00a423ef5
2012-11-16 07:42:30 -08:00
Laurent Tu
91d9d51f5d Return accuracy in GPS emulation
Accuracy is now a required field for location. To comply, set an
accuracy in returned fix. The accuracy is constant for now since
computing it from the NMEA sentence seems to be very complicated.

Bug: 6864500

Change-Id: Iff4c36b440b095539c717d35a812ee2ed7c1725f
2012-10-11 20:43:53 -07: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
a84522d2f3 Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.
This is needed for passing buffers to the camera HAL for reprocessing.

Bug: 6243944

Change-Id: Ibf8d15aead571ddb3b62674cf7afe0d508ca24e7
2012-09-04 09:23:17 -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
61649d232c Emulator gralloc: Fix RAW_SENSOR conditions.
Allow RAW_SENSOR to be used for any combination of CPU read/write and
Camera read/write, instead of only camera->cpu or cpu->camera.

Change-Id: I032b9531e9069a202c1a3767b77975c808703285
2012-08-20 11:05:01 -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
34a4d2d519 Emulator gralloc: Support YV12
Bug: 6243944
Change-Id: I5f416ab0ae15143df422c0f79d91841984b4fabe
2012-08-20 09:13:48 -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
4d57cb8d65 gralloc: Add automatic format selection. DO NOT MERGE
Have gralloc_alloc be able to select the appropriate pixel format
given the endpoints, triggered by new
GRALLOC_EMULATOR_PIXEL_FORMAT_AUTO format.

Currently supports camera->screen, and camera->video encoder.

Bug: 6243944
Change-Id: Ib1bf8da8d9184ac99e7f50aad09212c146c32809
2012-07-26 10:03:05 -07:00
Eino-Ville Talvala
3461561ccf gralloc: Support HAL_PIXEL_FORMAT_YCrCb_420_SP (NV21)
This is needed for Camera HAL2 video recording.

Bug: 6243944
Change-Id: I47a3e65117881612fb95068a80f811cc8378fbc6
2012-07-11 17:21:18 -07:00
Jesse Hall
e705cdde0d Update to renamed ANativeWindow methods
A few ANativeWindow methods were updatd to take a Sync HAL file
descriptor, and the existing methods were renamed with a _DEPRECATED
suffix. Since the emulator graphics acceleration doesn't yet support
the sync HAL, this change continues calling the deprecated functions
via their new names.

Change-Id: I5b1760811fafb6723ede887e32e63f94cbaeffe5
2012-06-21 23:16:56 -07:00
Xavier Ducrohet
c5fd927f4a am 8f38da3d: am e8f7f5fe: Fix WXGA800-7in to be portrait by default.
* commit '8f38da3deff60c9d5cac0b355c2d95d967216828':
  Fix WXGA800-7in to be portrait by default.
2012-06-21 19:41:14 -07:00