Commit Graph

2587 Commits

Author SHA1 Message Date
Eino-Ville Talvala
7f34893c98 am 9468d306: am c07123b1: Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev
* commit '9468d306eea2749831e2630ec4261a8b1b3117c2':
  EmulatedFakeCamera2: Add precapture trigger and reprocess support
2012-09-04 12:29:54 -07:00
Eino-Ville Talvala
9642da5102 Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
More dependent projects than I realized

This reverts commit a84522d2f3

Change-Id: Ifb50c94a2a5dfa91573f07695d8f3bfcadc79742
2012-09-04 12:27:04 -07:00
Eino-Ville Talvala
75832395dd Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
More dependent projects than I realized.

This reverts commit 4573a7194d

Change-Id: I53cfbc5cf5ef4436f5fa0c8b1ceb6296797e32fe
2012-09-04 12:26:21 -07:00
Eino-Ville Talvala
50d68de6af am 28125f96: am 4604e30d: Merge "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage." into jb-mr1-dev
* commit '28125f96a830e17e02d1a7435b098486e6e42a02':
  Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.
2012-09-04 12:11:53 -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
d692731553 am 2cb5c238: am cbb1d726: Merge "EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED" into jb-mr1-dev
* commit '2cb5c238cc6c37a66d29456bcca2167907e3fb7d':
  EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
2012-08-30 09:42:45 -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
23b06c5502 am 0999f50b: am adf05af0: Merge "add an app to generate localized text bitmaps needed for recovery" into jb-mr1-dev
* commit '0999f50b7208c2dcdb57bac95148d83651a1cacb':
  add an app to generate localized text bitmaps needed for recovery
2012-08-29 16:32:02 -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
e3dc84340f am c2967743: am 9aaa620b: Merge "EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size." into jb-mr1-dev
* commit 'c296774352dd1a652ccf800f641783d3a039cf9e':
  EmulatedFakeCamera2: Support (0,0) jpeg thumbnail size.
2012-08-28 16:59:54 -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
00beb80f9d am 08d13376: am cfb58b73: Merge "Emulator gralloc: Fix RAW_SENSOR conditions." into jb-mr1-dev
* commit '08d13376da55083577b4229f6de88152d90bd28f':
  Emulator gralloc: Fix RAW_SENSOR conditions.
2012-08-20 16:29:16 -07:00
Eino-Ville Talvala
d11af9229e am d0b48512: am 97438d24: Merge "EmulatedCamera2: Improve thread sequencing" into jb-mr1-dev
* commit 'd0b485127fdcfba5ece4d6255f7abd7f57efc852':
  EmulatedCamera2: Improve thread sequencing
2012-08-20 14:07:55 -07:00
Eino-Ville Talvala
fe9323eba6 am e8d431e9: am 02bcd398: Merge "Emulator gralloc: Support YV12" into jb-mr1-dev
* commit 'e8d431e98a28ce01444118f729b044e6d746c26c':
  Emulator gralloc: Support YV12
2012-08-20 14:07:53 -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
Chiao Cheng
d9553be5d1 Merge "Adding new script to generate Intellij projects." 2012-08-14 14:09:11 -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
Chiao Cheng
ac0a18e095 Adding new script to generate Intellij projects.
- Creates modules and includes only dependencies that are needed by
the parent module instead of including the entire source tree. The
new structure makes intellij much more responsive and fast.
- Adds proper android facets when AndroidManifest.xml exists for
quick resource lookup.
- Automatically includes intermediates directory for generated R files.
- Exclusion of un-neccessary language resource folders from id lookups.
- Automatic vcs configuration for git roots.
- Multi-module make file support.
- Aggregate modules for multi-module make files.

Change-Id: I181670b269faa1cc3ab257692833821fab20f73c
2012-08-08 17:23:48 -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
Jesse Hall
56513f5ff4 Move emugl system code to development.git
Because of the way the SDK and Android system images are branched,
host code that goes into the SDK tools can't live in the same
repository as code that goes into the system image. This change keeps
the emugl host code in sdk.git/emulator/opengl while moving the emugl
system code to development.git/tools/emulator/opengl.

A few changes were made beyond simply cloning the directories:

(a) Makefiles were modified to only build the relevant components. Not
    doing so would break the build due to having multiple rule
    definitions.

(b) Protocol spec files were moved from the guest encoder directories
    to the host decoder directories. The decoder must support older
    versions of the protocol, but not newer versions, so it makes
    sense to keep the latest version of the protocol spec with the
    decoder.

(c) Along with that, the encoder is now built from checked in
    generated encoder source rather than directly from the protocol
    spec.  The generated code must be updated manually. This makes it
    possible to freeze the system encoder version without freezing the
    host decoder version, and also makes it very obvious when a
    protocol changes is happening that will require special
    backwards-compatibility support in the decoder/renderer.

(d) Host-only and system-only code were removed from the repository
    where they aren't used.

(e) README and DESIGN documents were updated to reflect this split.

No actual source code was changed due to the above.

Change-Id: I2c936101ea0405b372750d36ba0f01e84d719c43
2012-06-06 09:46:29 -07:00
Chiao Cheng
6b2b55ac2a Merge "Updating intellij idegen project template to use jdk 1.6." 2012-06-04 11:06:16 -07:00
Chiao Cheng
797198bbe0 Updating intellij idegen project template to use jdk 1.6.
Also excluding prebuilt jars from classpath. These include all
previous versions of the android sdk jars. Increased heap size to 800
so google intellij plugin does not complain. Changed default
configuration to use global code style insead of per project code
style.

Change-Id: If97550000fdc282cf6d506eb80b830ff4c1b87b9
2012-06-01 15:27:36 -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