Commit graph

1124 commits

Author SHA1 Message Date
Alex Ray
8a8f86bbe6 modules: camera: Add buffer registration scaffold
Change-Id: Ic1d20dd7f93a0ca3cd2c3af3b33a7a9df47b5e89
2013-05-13 19:47:47 +00:00
Alex Ray
e0bd66511a Merge "modules: camera: Add Streams" 2013-05-13 19:47:22 +00:00
The Android Automerger
8282f0ba9d merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-09 05:55:29 -07:00
Jesse Hall
bb884457df am f20cae6b: am 4ed61b22: Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev
* commit 'f20cae6b94b7714e76b284f4167bb238e3aee2d2':
  Move virtual displays out of HWC 1.2, mark experimental
2013-05-08 15:05:14 -07:00
Eino-Ville Talvala
ef3b67d8d9 am df336e2d: am c6ff6c40: Merge "gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
* commit 'df336e2de4a57cc29815f4cdc75ee975676997d5':
  gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888
2013-05-08 15:04:16 -07:00
Eino-Ville Talvala
6f0f252c3c am c2f433d0: am b605944f: Camera3: Document cropping behavior
* commit 'c2f433d00ce5e5c56094d78808e580c426d728cf':
  Camera3: Document cropping behavior
2013-05-08 15:03:38 -07:00
Jesse Hall
f20cae6b94 am 4ed61b22: Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev
* commit '4ed61b22e046ed544f6afb50abd0af25d478d8b1':
  Move virtual displays out of HWC 1.2, mark experimental
2013-05-08 13:57:55 -07:00
Jesse Hall
4ed61b22e0 Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev 2013-05-08 20:53:34 +00:00
Eino-Ville Talvala
df336e2de4 am c6ff6c40: Merge "gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
* commit 'c6ff6c40dd4408c7aac0e079a6d26359902c240f':
  gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888
2013-05-08 09:56:53 -07:00
Eino-Ville Talvala
c6ff6c40dd Merge "gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev 2013-05-08 16:55:15 +00:00
The Android Automerger
ef5f7cd508 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-08 05:55:35 -07:00
Eino-Ville Talvala
c2f433d00c am b605944f: Camera3: Document cropping behavior
* commit 'b605944f0a0590d0f31d48a14eaf8e6a075ddba1':
  Camera3: Document cropping behavior
2013-05-07 17:05:52 -07:00
Jesse Hall
380f45dade Move virtual displays out of HWC 1.2, mark experimental
Bug: 8384764
Change-Id: I388ff3f46893b395e5c4187242f51ad7bb58da24
2013-05-07 12:03:27 -07:00
Eino-Ville Talvala
6efab252d5 gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888
Bug: 8734880
Change-Id: I0cca7fd1965e1547991be06b6b18d6302dbe8670
2013-05-06 14:05:05 -07:00
Alex Ray
bcaf788434 modules: camera: Add Streams
Adds a Stream object, and configureStreams support in parsing the
provided stream_array. Streams are naively setup for sync-less software
painting.

Change-Id: Ibbd90e3e2c7fa984dd5d2dcbd4da7bf4dad43aa1
2013-05-03 12:16:18 -07:00
Eino-Ville Talvala
b605944f0a Camera3: Document cropping behavior
Redefined somewhat from HAL2, to be simpler for everyone.

Bug: 8756080
Change-Id: I6b7608c74c06cc6a0bfe07997444e3b07c3edb10
2013-05-01 15:23:21 -07:00
Alex Ray
9bbaa309a9 am 1a0be33f: am 74b8c4e5: Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
* commit '1a0be33faa697ed455dfdf8a398b1481e518b1a3':
  gralloc: add lock_ycbcr method
2013-04-30 08:31:51 -07:00
Kenny Root
2a0a126ad9 am 03fa29db: am eca8b3cd: keymaster_test: simulate binder pages
* commit '03fa29dbc6a0048c98de22444f5d686b1bb9eb06':
  keymaster_test: simulate binder pages
2013-04-30 08:31:40 -07:00
The Android Automerger
43d9b5626c merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-30 05:56:08 -07:00
Alex Ray
c16e56dd43 modules: camera: Add scoped trace helper
This c++ helper class is normally provided by frameworks/native's
libutils, but cannot be used from the context of a hardware module.  For
now just add the required functionality locally in the hardware module.

Change-Id: I5b399cbeb1c017a95baf19456dbf20569e677fbe
2013-04-29 14:16:57 -07:00
Alex Ray
005c9da544 modules: camera: remove unused variable
Change-Id: Ic21cd58a750411167ef4b060e8d3abc295edc83d
2013-04-29 14:16:57 -07:00
Alex Ray
af3a4617b4 modules: camera: fix dump log message
Change-Id: I2511653b3d2d21d03785ea220c760e2b65f0b035
2013-04-29 14:16:27 -07:00
Alex Ray
1a0be33faa am 74b8c4e5: Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
* commit '74b8c4e57b6d0db6bdb79d298ef8bb19cad3be2e':
  gralloc: add lock_ycbcr method
2013-04-29 12:11:54 -07:00
Alex Ray
74b8c4e57b Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev 2013-04-29 19:10:07 +00:00
Kenny Root
03fa29dbc6 am eca8b3cd: keymaster_test: simulate binder pages
* commit 'eca8b3cdf0f906062285d03a0d08e3104625df94':
  keymaster_test: simulate binder pages
2013-04-29 11:27:55 -07:00
The Android Automerger
c6f5e626d2 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-29 05:55:52 -07:00
Kenny Root
eca8b3cdf0 keymaster_test: simulate binder pages
Make sure pages we use in the unit tests are read-only maps from
/dev/zero

Bug: 8736730
Change-Id: I15d816a8fd3dd7313277c9f5c44c4a102a899d03
2013-04-27 09:01:19 -07:00
Alex Ray
06e3bf2566 gralloc: add lock_ycbcr method
This method is meant for locking the flexible YCbCr format documented in
the system graphics header.

Bug: 8734880
Change-Id: I45ae8937dcc16d0ae8a204a136121f78b4cc51e0
2013-04-26 13:51:10 -07:00
Eino-Ville Talvala
c9968759eb am ddf31fd6: am 75f0d0ec: Merge "Camera3: Clarify SHUTTER timing, ownership of request contents" into jb-mr2-dev
* commit 'ddf31fd62a10d4fea6cdd2c4d3723257d0f53a66':
  Camera3: Clarify SHUTTER timing, ownership of request contents
2013-04-25 13:50:36 -07:00
Eino-Ville Talvala
ddf31fd62a am 75f0d0ec: Merge "Camera3: Clarify SHUTTER timing, ownership of request contents" into jb-mr2-dev
* commit '75f0d0ec0db5ab01e0937e4068c4be9e799e9853':
  Camera3: Clarify SHUTTER timing, ownership of request contents
2013-04-25 12:30:37 -07:00
Eino-Ville Talvala
75f0d0ec0d Merge "Camera3: Clarify SHUTTER timing, ownership of request contents" into jb-mr2-dev 2013-04-25 19:28:27 +00:00
The Android Automerger
bdcf9d0a9c merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-24 05:55:34 -07:00
Etienne Le Grand
de889fc3ef am 4daa2f8e: am 7a813e84: Modify sign of bias in uncalibrated magnetometer
* commit '4daa2f8ea99631655fa469b3af33c0d3477dd42b':
  Modify sign of bias in uncalibrated magnetometer
2013-04-23 15:02:08 -07:00
Etienne Le Grand
4daa2f8ea9 am 7a813e84: Modify sign of bias in uncalibrated magnetometer
* commit '7a813e844252612cd8f7fa4e391825477d8b63d0':
  Modify sign of bias in uncalibrated magnetometer
2013-04-23 14:38:46 -07:00
Etienne Le Grand
7a813e8442 Modify sign of bias in uncalibrated magnetometer
bug 8632692
Change-Id: If92f0030e53d41a7d0bc3c3b003f5eb939123945
2013-04-23 14:32:22 -07:00
Eino-Ville Talvala
71af102b48 Camera3: Clarify SHUTTER timing, ownership of request contents
- Clarify ownership of fence file descriptors, including in case of
  errors.

- Make it clear notify SHUTTER must be called before the first
  process_capture_result.

Change-Id: I644054a7a055c2e8a6a164c5ab6439ef2a0d1df1
2013-04-22 14:19:21 -07:00
The Android Automerger
b7a85896df merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-22 05:55:46 -07:00
Igor Murashkin
011074d419 am a3f1b92b: am 29156e43: Merge "Make raw tests optional, add sanity checks for format/resolutions static info." into jb-mr2-dev
* commit 'a3f1b92b774c07bcbd9437142718d8faa99ba4c2':
  Make raw tests optional, add sanity checks for format/resolutions static info.
2013-04-19 10:41:35 -07:00
Igor Murashkin
a3f1b92b77 am 29156e43: Merge "Make raw tests optional, add sanity checks for format/resolutions static info." into jb-mr2-dev
* commit '29156e437858087c393c21e0502a1652fb77dd13':
  Make raw tests optional, add sanity checks for format/resolutions static info.
2013-04-19 10:38:32 -07:00
Igor Murashkin
29156e4378 Merge "Make raw tests optional, add sanity checks for format/resolutions static info." into jb-mr2-dev 2013-04-19 17:34:04 +00:00
Alex Ray
1d2ab74914 am 071d9e4b: am a7c66429: Revert "gralloc: add lock_ycbcr method"
* commit '071d9e4b82a3d280b61ce8bb0a969b319465cd76':
  Revert "gralloc: add lock_ycbcr method"
2013-04-18 15:13:47 -07:00
Alex Ray
071d9e4b82 am a7c66429: Revert "gralloc: add lock_ycbcr method"
* commit 'a7c66429136efe294240ebe96cfe67881514849f':
  Revert "gralloc: add lock_ycbcr method"
2013-04-18 15:10:15 -07:00
Alex Ray
a7c6642913 Revert "gralloc: add lock_ycbcr method"
This reverts commit baa47f353a.
2013-04-18 15:02:57 -07:00
Alex Ray
b486d23ca9 am d86875fb: am c82a0e77: Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
* commit 'd86875fb8dd4178937858fccdd6fabc392fbabb5':
  gralloc: add lock_ycbcr method
2013-04-18 13:48:34 -07:00
Alex Ray
d86875fb8d am c82a0e77: Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
* commit 'c82a0e7792190a2c02826dccf8a77473c6fce980':
  gralloc: add lock_ycbcr method
2013-04-18 13:42:22 -07:00
Alex Ray
c82a0e7792 Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev 2013-04-18 20:39:42 +00:00
Matthew Xie
75f409159a am b98207b0: am 47a0ead4: Merge "LE (1/3): Add application ID to connection callback" into jb-mr2-dev
* commit 'b98207b0b657f7a45f23ab11f89cff6987f6af15':
  LE (1/3): Add application ID to connection callback
2013-04-18 11:37:12 -07:00
Matthew Xie
b98207b0b6 am 47a0ead4: Merge "LE (1/3): Add application ID to connection callback" into jb-mr2-dev
* commit '47a0ead467b563c97e2813c292e90f31e650c640':
  LE (1/3): Add application ID to connection callback
2013-04-18 11:33:21 -07:00
Matthew Xie
47a0ead467 Merge "LE (1/3): Add application ID to connection callback" into jb-mr2-dev 2013-04-18 18:31:12 +00:00
Igor Murashkin
3d991c8e85 Make raw tests optional, add sanity checks for format/resolutions static info.
Bug: 8654456
Change-Id: Iadd0d3c326d595dce2822a9bd3ff33ce8e8f6a36
2013-04-18 11:00:16 -07:00