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
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
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
Baligh Uddin
6b03c84e6e
Use more secure exponent for generating keys
...
Bug: 7246090
Change-Id: Ic6cbac975fcb96b436e27a87b1f81b5e3dac6321
2012-09-28 11:30:10 -07:00
Doug Zongker
c31f70a3e4
center text, fix extents for multiline texts
...
Bug: 7064142
Change-Id: I3c423c54609b28def1db56084190bf10b87f40f8
2012-09-18 15:47:52 -07:00
Doug Zongker
608a5afb92
update the localizer tool to use all available translations
...
Bug: 7064142
Change-Id: I606b7e2cf4bd2ab58c14af969a98089960100ff5
2012-09-18 12:40:57 -07:00
Baligh Uddin
5f25ef0412
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-14 16:08:28 -07:00
Baligh Uddin
c2760a00ea
Import translations. DO NOT MERGE
...
Change-Id: I90a11fad1986532f4895f7b7edf682364d387faa
Auto-generated-cl: translation import
2012-09-14 13:42:32 -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
cbb1d726c6
Merge "EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED" into jb-mr1-dev
2012-08-30 09:38:38 -07:00
Doug Zongker
adf05af0b9
Merge "add an app to generate localized text bitmaps needed for recovery" into jb-mr1-dev
2012-08-29 16:27:39 -07:00
Doug Zongker
a95366ae57
add an app to generate localized text bitmaps needed for recovery
...
Recovery only knows how to display images, so any text has to be
turned into bitmaps. This app displays each localized version of the
text in a TextView and then captures a bitmap, combining them and
generating an output PNG.
Change-Id: Ib16858a1d66e9839d1255b962fb1aaf8982bfe10
2012-08-29 16:04:12 -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
42467d908f
Merge "EmulatedFakeCamera2: Add face detection support." into jb-mr1-dev
2012-08-13 10:13:47 -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
819d2aac43
Merge "EmulatedFakeCamera2: Add autofocus management" into jb-mr1-dev
2012-08-10 12:38:05 -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
Elliott Hughes
60fa2c3888
am ede21119: am fdb7308b: Merge "Use uintptr_t for cast pointer to integer."
...
* commit 'ede21119df2a9bfed7125380fbe7af32c7aa13e3':
Use uintptr_t for cast pointer to integer.
2012-08-06 13:23:27 -07:00
SangWook Han
ac8ed5e089
Use uintptr_t for cast pointer to integer.
...
On 64bit host, sizeof pointer is not equal to sizeof int.
Need for host tools.
Change-Id: I848ceb878b873e6764a077e8a4ee31e756f30017
2012-07-31 11:02:59 +09: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
Xavier Ducrohet
8f38da3def
am e8f7f5fe: Fix WXGA800-7in to be portrait by default.
...
* commit 'e8f7f5fe9f08c2381908d13a63fc34b12d6f95c3':
Fix WXGA800-7in to be portrait by default.
2012-06-21 19:39:13 -07:00
Xavier Ducrohet
e8f7f5fe9f
Fix WXGA800-7in to be portrait by default.
...
Bug: 6712001
Change-Id: I047e023e726f83ff63f8fe00fb3f43698ad1db37
2012-06-21 19:33:26 -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
2a2ada537a
Emulator gralloc: Support HAL_PIXEL_FORMAT_BLOB
...
Bug: 6243944
Change-Id: I2864bc59be9df8741639a291c71e2f65dde5bc0b
2012-06-13 12:08:18 -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
Xavier Ducrohet
547975cf50
am 98a05b89: am 21f4ca57: am 74ed92d3: Merge "Move emugl system code to development.git"
...
* commit '98a05b894e6f2981816a87ea0dbd6a3092d5c507':
Move emugl system code to development.git
2012-06-07 12:21:17 -07:00
Xavier Ducrohet
98a05b894e
am 21f4ca57: am 74ed92d3: Merge "Move emugl system code to development.git"
...
* commit '21f4ca579e58e9a2eaad841f5174eba44c926153':
Move emugl system code to development.git
2012-06-07 12:19:21 -07:00