Colin Cross [Thu, 29 Aug 2013 21:43:38 +0000 (21:43 +0000)]
Merge "exynos: gralloc: register buffers in alloc"
Greg Hackmann [Wed, 28 Aug 2013 00:14:27 +0000 (17:14 -0700)]
gralloc: use BGRA byte order for framebuffer target
Bug:
10429036
Change-Id: Idac73fd588cca70e075c017af00dd590b14b0c7e
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Colin Cross [Fri, 23 Aug 2013 02:44:28 +0000 (19:44 -0700)]
exynos: gralloc: register buffers in alloc
gralloc_alloc was creating buffers with ion_alloc_fd, which results
in a dmabuf but no ion handle. This makes it hard to track buffers
that are never registered with another process, or ones that are
unregistered from their process like the wallpaper.
Call gralloc_register_buffer from inside alloc to convert the dmabufs
to ion handles, and gralloc_unregister_buffer inside free.
gralloc_register_buffer currently unnecissarily maps the buffer as
well, which gralloc_lock will do as necessary, so remove the map.
gralloc_unregister_buffer will unmap if necesssary, so remove
the call to grallocUnmap in gralloc_free. That leaves no callers
to grallocUnmap (and there weren't any callers to grallocMap), so
remove them and gr.h.
Change-Id: I20cf2d50732d018f12779d78582686ca622a332a
Lajos Molnar [Thu, 1 Aug 2013 20:20:12 +0000 (13:20 -0700)]
*HACK* assume android requests 1 more buffer then we specify
This used to be usually 2, but for synchronous surfaces that are
used most commonly, it is now 1.
The proper fix would be to allow android to request arbitrarily
more buffers than we specify to account for different buffer
consumer requirements, but that does not work with current code
base.
Change-Id: Ieeafda28b547343d420e7b74e0e5c4a7033673b8
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9970482
Mathias Agopian [Fri, 26 Jul 2013 21:50:14 +0000 (14:50 -0700)]
get rid of HAL pixelformats 5551 and 4444
Change-Id: I2b0eb35344631d162b30dd22ee0ad7651f22e6fa
Zhijun He [Thu, 18 Jul 2013 01:06:25 +0000 (18:06 -0700)]
Camera2: Update static camera metadata
Change-Id: Ia2ad2879446e3e03e9c120f38d5d68ed6d35231d
Lajos Molnar [Fri, 12 Jul 2013 19:31:26 +0000 (12:31 -0700)]
Update VP8 component role
VP8 component role changed to "video_decoder.vp8" in the framework.
Change-Id: Icba81db7ae921df321e2426ca426b3eaf13fbb98
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9759512
The Android Open Source Project [Thu, 6 Jun 2013 17:43:05 +0000 (10:43 -0700)]
am
86dc75dc: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
86dc75dcb45880832dc125d2f38dce4ca63a1e78':
libcamera2: add hardwareLevel to camera metadata
The Android Open Source Project [Thu, 6 Jun 2013 17:37:30 +0000 (10:37 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Id19e45c1de96766e22fa6e721c864214ba233fd6
The Android Automerger [Wed, 5 Jun 2013 17:17:51 +0000 (10:17 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Alex Ray [Mon, 3 Jun 2013 20:23:34 +0000 (13:23 -0700)]
libcamera2: add hardwareLevel to camera metadata
Technically, this is only required for v3 and higher devices, and this
is a v2 device. There aren't any other v2 devices, so our framework
logic just treats them the same. Adding this metadata entry puts this
device back as a first-class full (v3) device in the framework.
Bug:
9261359
Change-Id: I4ba91c5689fd17d4a3f2044fae1c39dd9ee625df
Alex Ray [Tue, 4 Jun 2013 00:16:35 +0000 (17:16 -0700)]
am
b10d106f: am
05c0c1a4: libcamera2: add hardwareLevel to camera metadata
* commit '
b10d106f6e991177020c318ffb9d0fb0cca3eddc':
libcamera2: add hardwareLevel to camera metadata
Alex Ray [Tue, 4 Jun 2013 00:03:58 +0000 (17:03 -0700)]
am
05c0c1a4: libcamera2: add hardwareLevel to camera metadata
* commit '
05c0c1a4b70392cf7a8a3fd7d12f99e597a3e996':
libcamera2: add hardwareLevel to camera metadata
Alex Ray [Mon, 3 Jun 2013 20:23:34 +0000 (13:23 -0700)]
libcamera2: add hardwareLevel to camera metadata
Technically, this is only required for v3 and higher devices, and this
is a v2 device. There aren't any other v2 devices, so our framework
logic just treats them the same. Adding this metadata entry puts this
device back as a first-class full (v3) device in the framework.
Bug:
9261359
Change-Id: I4ba91c5689fd17d4a3f2044fae1c39dd9ee625df
Christopher Ferris [Thu, 23 May 2013 21:38:15 +0000 (14:38 -0700)]
am
81f2b4af: am
d5d1a4e8: Merge "Fix missing argument."
* commit '
81f2b4af7e151709230e80d690b454783efd3809':
Fix missing argument.
Christopher Ferris [Thu, 23 May 2013 21:32:03 +0000 (14:32 -0700)]
am
d5d1a4e8: Merge "Fix missing argument."
* commit '
d5d1a4e8e844e806c48d99d0ecfd2ff37bd253ed':
Fix missing argument.
Christopher Ferris [Thu, 23 May 2013 20:26:01 +0000 (20:26 +0000)]
Merge "Fix missing argument."
Christopher Ferris [Fri, 3 May 2013 23:58:30 +0000 (16:58 -0700)]
Fix missing argument.
Merge from internal master.
(cherry-picked from
32c3b671851f36604c616030365e6047257998c2)
Change-Id: Ibbdba220eb3f79505eac5aa810f942a76a0f49d9
Christopher Ferris [Fri, 3 May 2013 23:58:30 +0000 (16:58 -0700)]
Fix missing argument.
Change-Id: Ic067f205acb379aa112db6adc717b53d3e79db22
Chong Zhang [Mon, 20 May 2013 20:18:00 +0000 (20:18 +0000)]
Merge "exynos_omx: : fail storeMetaDataInBuffers on output port"
The Android Open Source Project [Mon, 20 May 2013 15:26:24 +0000 (08:26 -0700)]
am
e15285c1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
e15285c1fa96c9e3c3dacbe8f1a2e25b7be299f1':
Camera: Fix green JPEGs
The Android Open Source Project [Mon, 20 May 2013 15:20:32 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I388b86949eef906330343df9a5b3166d0c21d743
Eino-Ville Talvala [Fri, 17 May 2013 00:33:06 +0000 (17:33 -0700)]
Camera: Fix green JPEGs
Need crop regions to be 4 entries on the input and the output; otherwise
the sanity checks when doing reprocessing will reject the HAL's own output.
Bug:
8947463
Change-Id: I0be0ac816cb65c802c3a5ae56af732edf9145edc
The Android Open Source Project [Fri, 17 May 2013 19:59:38 +0000 (12:59 -0700)]
am
27b4511d: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
27b4511d4bee1ae302de2af0fd14c6b7361a7590':
The Android Open Source Project [Fri, 17 May 2013 19:54:40 +0000 (12:54 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ie94a2d958b0a91e2ea0e0c48a91b4092f6fab942
Eino-Ville Talvala [Fri, 17 May 2013 03:50:45 +0000 (20:50 -0700)]
am
a44d2d1e: am
39ed5163: Camera: Fix green JPEGs
* commit '
a44d2d1e3a66d93b2be5bb11ab05b886d70099d1':
Camera: Fix green JPEGs
Eino-Ville Talvala [Fri, 17 May 2013 03:45:45 +0000 (20:45 -0700)]
am
39ed5163: Camera: Fix green JPEGs
* commit '
39ed516364d4f0b2648113cb3f94533e86c2da95':
Camera: Fix green JPEGs
Eino-Ville Talvala [Fri, 17 May 2013 00:33:06 +0000 (17:33 -0700)]
Camera: Fix green JPEGs
Need crop regions to be 4 entries on the input and the output; otherwise
the sanity checks when doing reprocessing will reject the HAL's own output.
Bug:
8947463
Change-Id: I0be0ac816cb65c802c3a5ae56af732edf9145edc
The Android Automerger [Thu, 16 May 2013 12:55:38 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 16 May 2013 12:48:21 +0000 (05:48 -0700)]
am
38d9ff02: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
38d9ff020b56bd7b1dfcbfa9f5c0185271bc08c8':
The Android Open Source Project [Thu, 16 May 2013 12:43:56 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iec327c611f56804aeddd1a4310e967b9fd6c7467
Chong Zhang [Wed, 15 May 2013 22:45:11 +0000 (15:45 -0700)]
exynos_omx: : fail storeMetaDataInBuffers on output port
Metadata mode is not supported yet on output port.
Bug:
8987541
Change-Id: Ia9b88ee9e4535194b40dca143a188ad19af36ccc
Dmitry Shmidt [Wed, 15 May 2013 21:06:51 +0000 (14:06 -0700)]
am
612b1be6: am
25bee067: exynos_omx: Increase number of video resources
* commit '
612b1be67e8b13f2ab66f86f6d279133411d237a':
exynos_omx: Increase number of video resources
Dmitry Shmidt [Wed, 15 May 2013 20:35:20 +0000 (13:35 -0700)]
am
25bee067: exynos_omx: Increase number of video resources
* commit '
25bee067b500484f8b0a1976da0ff672a7eb7e9e':
exynos_omx: Increase number of video resources
Dmitry Shmidt [Wed, 15 May 2013 19:42:08 +0000 (12:42 -0700)]
exynos_omx: Increase number of video resources
Bug:
8950258
Change-Id: I497fe3c199298dba3c0932cd640b0d3b98417ded
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Automerger [Mon, 13 May 2013 12:55:48 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Thu, 9 May 2013 21:19:51 +0000 (14:19 -0700)]
am
c7663a2e: am
6a3cbcaf: Merge "camera: Use cropRegion as 4 parts instead of 3 parts" into jb-mr2-dev
* commit '
c7663a2e6ff4a75548bb57a939a0ad78a3ff0030':
camera: Use cropRegion as 4 parts instead of 3 parts
Igor Murashkin [Thu, 9 May 2013 19:04:54 +0000 (12:04 -0700)]
am
6a3cbcaf: Merge "camera: Use cropRegion as 4 parts instead of 3 parts" into jb-mr2-dev
* commit '
6a3cbcafbfceabad2711388f1e417982deaf5fdf':
camera: Use cropRegion as 4 parts instead of 3 parts
Igor Murashkin [Thu, 9 May 2013 19:01:23 +0000 (19:01 +0000)]
Merge "camera: Use cropRegion as 4 parts instead of 3 parts" into jb-mr2-dev
Igor Murashkin [Tue, 7 May 2013 23:40:33 +0000 (16:40 -0700)]
camera: Use cropRegion as 4 parts instead of 3 parts
Bug:
8756080
Change-Id: Id3dff232091f73e4ed143d2f0010451c3709fbcb
The Android Automerger [Mon, 6 May 2013 12:55:39 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Thu, 2 May 2013 16:20:06 +0000 (09:20 -0700)]
am
e22e9935: am
7af11689: Merge "Camera2: Adjust sensor dimensions for correct FOV." into jb-mr2-dev
* commit '
e22e9935d1aff7224d1179385481a17886e41db2':
Camera2: Adjust sensor dimensions for correct FOV.
Eino-Ville Talvala [Thu, 2 May 2013 16:18:06 +0000 (09:18 -0700)]
am
7af11689: Merge "Camera2: Adjust sensor dimensions for correct FOV." into jb-mr2-dev
* commit '
7af1168953fa6aa5337de11fbf78d16fc6768834':
Camera2: Adjust sensor dimensions for correct FOV.
Eino-Ville Talvala [Thu, 2 May 2013 16:15:54 +0000 (16:15 +0000)]
Merge "Camera2: Adjust sensor dimensions for correct FOV." into jb-mr2-dev
The Android Automerger [Wed, 1 May 2013 12:55:52 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Taehwan Kim [Tue, 30 Apr 2013 23:49:53 +0000 (16:49 -0700)]
am
07fbffd2: am
8f33812f: exynos_omx: multi_thread: Support for testCreateInputSurfaceErrors Test.
* commit '
07fbffd20c27979a19204dff09eabd74809b3208':
exynos_omx: multi_thread: Support for testCreateInputSurfaceErrors Test.
Taehwan Kim [Tue, 30 Apr 2013 23:42:55 +0000 (16:42 -0700)]
am
8f33812f: exynos_omx: multi_thread: Support for testCreateInputSurfaceErrors Test.
* commit '
8f33812f854fabb86b60074d956359d04473fb85':
exynos_omx: multi_thread: Support for testCreateInputSurfaceErrors Test.
Eino-Ville Talvala [Tue, 30 Apr 2013 20:32:53 +0000 (13:32 -0700)]
Camera2: Adjust sensor dimensions for correct FOV.
Bug:
8484377
Change-Id: I22ddd62edddc2c9ba10cac35af083df14f0e8f9a
Taehwan Kim [Tue, 30 Apr 2013 09:10:08 +0000 (09:10 +0000)]
exynos_omx: multi_thread: Support for testCreateInputSurfaceErrors Test.
mediaserver crash is resolved.
Bug:
8329017
Change-Id: I6f6f160709e1e8be21a17bce2954a3e4a12d53a2
Signed-off-by: Taehwan Kim <t_h.kim@samsung.com>
Dima Zavin [Tue, 30 Apr 2013 14:13:11 +0000 (07:13 -0700)]
am
f3032769: am
9449b168: keystore: don\'t use binder input buffers for rsa sign/verify directly
* commit '
f3032769089045521e8ce8a992a91bfe5da7557c':
keystore: don't use binder input buffers for rsa sign/verify directly
The Android Automerger [Tue, 30 Apr 2013 12:56:09 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Dima Zavin [Mon, 29 Apr 2013 17:00:50 +0000 (10:00 -0700)]
am
9449b168: keystore: don\'t use binder input buffers for rsa sign/verify directly
* commit '
9449b168e067934c54cd846f61791cc8e52cea22':
keystore: don't use binder input buffers for rsa sign/verify directly
Dima Zavin [Sat, 27 Apr 2013 07:05:57 +0000 (00:05 -0700)]
keystore: don't use binder input buffers for rsa sign/verify directly
The input buffers for RSA sign/verify are passed over the binder, which
maps it into this process as read-only. When this buffer is passed
to mobicore, it tries to pin the page with __get_user_pages with
PROT_WRITE, which fails. Since the mobicore transport code doesn't
know if the APIs are producers or consumers, it "rightfully" assumes
all buffers are read/write. The interface to trustzone currently
doesn't support specifying read/write access bits, so instead
we create a copy of the input data in a locally allocated
malloc buffer and use that instead.
Bug:
8019596
Change-Id: I3c77c893f674ec73196a8a2ea3e5a24fb9e3b860
Signed-off-by: Dima Zavin <dima@android.com>
The Android Automerger [Thu, 18 Apr 2013 12:55:48 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Alex Ray [Wed, 17 Apr 2013 23:38:21 +0000 (16:38 -0700)]
am
90fc5d04: am
6568c0f1: libcamera2: use chroma gralloc private usage flag
* commit '
90fc5d042f2c0d8b49eb596ba0f6d21f11bdc50b':
libcamera2: use chroma gralloc private usage flag
Alex Ray [Wed, 17 Apr 2013 23:38:21 +0000 (16:38 -0700)]
am
c875066b: am
06f1fa77: gralloc: add private flag to indicate chroma space
* commit '
c875066b47de8ae041894a82e35775b468980f5a':
gralloc: add private flag to indicate chroma space
Alex Ray [Wed, 17 Apr 2013 23:11:04 +0000 (16:11 -0700)]
am
6568c0f1: libcamera2: use chroma gralloc private usage flag
* commit '
6568c0f1e188d3470333e15cc157d7199117e664':
libcamera2: use chroma gralloc private usage flag
Alex Ray [Wed, 17 Apr 2013 23:11:04 +0000 (16:11 -0700)]
am
06f1fa77: gralloc: add private flag to indicate chroma space
* commit '
06f1fa77873867819b1a6c24ba3c9a088ec6360d':
gralloc: add private flag to indicate chroma space
Alex Ray [Mon, 15 Apr 2013 18:25:08 +0000 (11:25 -0700)]
libcamera2: use chroma gralloc private usage flag
Bug:
7985212
Change-Id: Id3dd2617572f1cfb668407e4edf3feaeada0d6c9
Alex Ray [Mon, 15 Apr 2013 18:24:13 +0000 (11:24 -0700)]
gralloc: add private flag to indicate chroma space
Bug:
7985212
Change-Id: I1f1205040a72438246246775d57508af16ba1dbd
The Android Open Source Project [Wed, 10 Apr 2013 17:08:31 +0000 (10:08 -0700)]
am
87adbf52: Reconcile with jb-mr2-release - do not merge
* commit '
87adbf5234355371b0284353d03980b65b45b23c':
libcamera2: Protect in-flight counts.
The Android Open Source Project [Wed, 10 Apr 2013 17:05:50 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ib821de8f91e2992b52565dbd8c10a94e37c0ee45
The Android Automerger [Wed, 10 Apr 2013 12:56:32 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 06:25:25 +0000 (23:25 -0700)]
am
27877c2f: Merge "Add liblog" into jb-mr2-dev
* commit '
27877c2ff75ec10b994f7e0cfdd5f1b82fc37201':
Add liblog
Ying Wang [Wed, 10 Apr 2013 05:20:15 +0000 (05:20 +0000)]
Merge "Add liblog" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:00:24 +0000 (22:00 -0700)]
Add liblog
Bug:
8580410
Change-Id: I23c1f8541e7de016aa920d13dd35d9b5c7b7d1c8
Alex Ray [Tue, 9 Apr 2013 00:44:06 +0000 (17:44 -0700)]
libcamera2: Protect in-flight counts.
Protect numEntries accesses with numEntriesLock.
Protect jpegEncoder accesses with jpegEncoderLock.
Bug:
8058308
Change-Id: Idc31172d7d154ae2051e9eab94dadcf8f6cdddd3
Alex Ray [Tue, 9 Apr 2013 22:31:28 +0000 (15:31 -0700)]
am
1264ab16: libcamera2: Protect in-flight counts.
* commit '
1264ab1629accf444d13831e209eafe4657d7664':
libcamera2: Protect in-flight counts.
Alex Ray [Tue, 9 Apr 2013 00:44:06 +0000 (17:44 -0700)]
libcamera2: Protect in-flight counts.
Protect numEntries accesses with numEntriesLock.
Protect jpegEncoder accesses with jpegEncoderLock.
Bug:
8058308
Change-Id: Idc31172d7d154ae2051e9eab94dadcf8f6cdddd3
SeungBeom Kim [Mon, 8 Apr 2013 16:47:46 +0000 (09:47 -0700)]
am
d866f455: exynos_omx: multi_thread: Bug fix.
* commit '
d866f455acab131be8f058733abd9c1ede2fcfea':
exynos_omx: multi_thread: Bug fix.
SeungBeom Kim [Thu, 4 Apr 2013 05:45:37 +0000 (14:45 +0900)]
exynos_omx: multi_thread: Bug fix.
wrong parameter fixed.
Change-Id: If0750b5a669249824b12ac13fa447e2208acd798
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Rebecca Schultz Zavin [Tue, 2 Apr 2013 18:04:29 +0000 (11:04 -0700)]
am
601acb66: Switch camera allocations to the system heap.
* commit '
601acb664031226cf9883908c793d364c2e07e63':
Switch camera allocations to the system heap.
Rebecca Schultz Zavin [Fri, 22 Mar 2013 20:49:08 +0000 (13:49 -0700)]
Switch camera allocations to the system heap.
The exynos heap is sometimes failing.
Bug:
8049715
Change-Id: Id1a25ea1ce44f26693c5ee9a72d6c5a5126b9b69
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Alex Ray [Thu, 28 Mar 2013 00:13:15 +0000 (17:13 -0700)]
am
483728e7: libcamera2: initialize camera device AF state
* commit '
483728e7cd506afa89d8ace7ffe43f841c73725b':
libcamera2: initialize camera device AF state
Alex Ray [Thu, 28 Mar 2013 00:13:15 +0000 (17:13 -0700)]
am
5c664f4c: libcamera2: Handle ion_alloc failures
* commit '
5c664f4ce4110c37bd30fdedb79026780635f308':
libcamera2: Handle ion_alloc failures
Alex Ray [Wed, 27 Mar 2013 23:29:00 +0000 (16:29 -0700)]
libcamera2: initialize camera device AF state
Bug:
8491870
Change-Id: I29922e819a0274f8ab9a102d998659070fd35341
Alex Ray [Wed, 27 Mar 2013 21:34:03 +0000 (14:34 -0700)]
libcamera2: Handle ion_alloc failures
Return error when failing to allocate sensor scratch buffers in device
open.
Bug:
8049715
Change-Id: Ib7e05e226ab08190f4bf933f8aa06ccd44758508
SeungBeom Kim [Fri, 22 Mar 2013 23:16:40 +0000 (23:16 +0000)]
am
690c3990: exynos_omx: multi_thread: Support for CTS DecodeEditEncodeTest.
* commit '
690c39906e5dab752a87ed741c94ae4b6fc6db20':
exynos_omx: multi_thread: Support for CTS DecodeEditEncodeTest.
SeungBeom Kim [Mon, 11 Mar 2013 05:31:56 +0000 (14:31 +0900)]
exynos_omx: multi_thread: Support for CTS DecodeEditEncodeTest.
Added code to check the length of the input data in encoding time.
Bug:
8329017
Change-Id: I58e84625bf4b56c90404cbe3b5abc2bf693f1673
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:56:08 +0000 (20:56 +0000)]
am
ed9dc1f8: (-s ours) am
da8940f4: am
71dc25d1: am
58ac2762: am
a03f07f0: (-s ours) am
d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
ed9dc1f8074491341696bf7d9192b87784963b4a':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:44:27 +0000 (13:44 -0700)]
am
da8940f4: am
71dc25d1: am
58ac2762: am
a03f07f0: (-s ours) am
d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
da8940f4e81a3f56ace5699b89cc4e09779904ef':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:13:32 +0000 (13:13 -0700)]
am
71dc25d1: am
58ac2762: am
a03f07f0: (-s ours) am
d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
71dc25d1929a80c636008d0e491bfa282d69bec0':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:00:37 +0000 (13:00 -0700)]
am
58ac2762: am
a03f07f0: (-s ours) am
d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
58ac276242d6fd28324bb9c0f09aff64765c4d8e':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:59 +0000 (12:41 -0700)]
am
a03f07f0: (-s ours) am
d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a03f07f013265d3e5f8ee36184c613d9b5032c11':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:27:40 +0000 (12:27 -0700)]
am
d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
d2e43dce632fdcdf56927635b6bbd48d90ec796d':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:20:50 +0000 (12:20 -0700)]
Reconcile with jb-mr1-release - do not merge
Alex Ray [Fri, 8 Mar 2013 00:13:44 +0000 (00:13 +0000)]
am
d09ee48e: gralloc: add private field to indicate chromaticity
* commit '
d09ee48e1cd72e2b14cdba926a409fec3c9fbe43':
gralloc: add private field to indicate chromaticity
Alex Ray [Tue, 5 Mar 2013 20:47:50 +0000 (12:47 -0800)]
gralloc: add private field to indicate chromaticity
Separate differentiation between gamuts (wide vs narrow) and
chromaticities (BT.601 vs BT.709).
Change-Id: I892408fae5d12034067c02fe41b03f21b4274af5
Greg Hackmann [Wed, 6 Mar 2013 18:06:23 +0000 (10:06 -0800)]
hwc: remove obsolete check for HWC 1.0 composition target
Change-Id: Iba61c14c8dc238e5ff33c30e2739f61aaa103871
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Bartosz Szatkowski [Tue, 19 Feb 2013 12:49:30 +0000 (12:49 +0000)]
Use 64B alignment for RGB buffers
Change-Id: Ia36c1638abfae19d988b026f193e6cd281db040f
SeungBeom Kim [Wed, 16 Jan 2013 06:23:19 +0000 (15:23 +0900)]
exynos_omx: multi_thread: Support EOSBehavior.
Support EOSBehavior for testEOSBehaviorH263 & testEOSBehaviorH264.
Bug:
7961269
Change-Id: I13f93b2bfd01fb5c0678da3b0c9b9de7f4a863ee
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Greg Hackmann [Tue, 19 Feb 2013 18:17:18 +0000 (10:17 -0800)]
hwc: is_offscreen() should look at display frame, not source crop
Change-Id: I8cde6d6086caaf9e1363f5b2532315da811a1ae9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Kenny Root [Fri, 15 Feb 2013 17:35:29 +0000 (17:35 +0000)]
Merge "Hardware keymaster HAL should not indicate 'software'"
Kenny Root [Thu, 29 Nov 2012 19:42:59 +0000 (11:42 -0800)]
Hardware keymaster HAL should not indicate 'software'
Remove the 'software' flag so that keystore knows that this is a
hardware implementation.
Bug:
7106634
Change-Id: I1eef2d3564dc4e687644bd156694c893cc9a8e8d
Alex Ray [Thu, 31 Jan 2013 05:19:59 +0000 (21:19 -0800)]
gralloc: add private field to indicate gamut
Differentiate between YUV buffers with JFIF and BT.601 gamuts (value
ranges).
Bug:
7985212
Change-Id: I91c3d97858b4d2a54e2d2c67e3417715024561bb
Greg Hackmann [Mon, 14 Jan 2013 23:56:05 +0000 (15:56 -0800)]
omx: use G2D CSC for encoding surface textures
Change-Id: I1c7297f35b7740a5a9f0ce040c005135125c15fe
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Mon, 14 Jan 2013 23:54:46 +0000 (15:54 -0800)]
csc: support hardware CSC with G2D
Change-Id: Id6d16e4f79245e1895e8bc66372eef27509722b9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Mon, 14 Jan 2013 23:30:24 +0000 (15:30 -0800)]
csc: allow compiling with multiple HW types
Once G2D support is added, the same binary should be usable for either
Gscaler or G2D. The HW type is controlled through the new property
CSC_HW_PROPERTY_HW_TYPE.
Also return an error if any hardware properties are set after the device
is already opened. This didn't work before and should never happen, but
it's worth adding a check just in case.
Change-Id: I6d3fab4e777395a7e14a1f54353100902c76f75e
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Tue, 15 Jan 2013 17:29:40 +0000 (09:29 -0800)]
gralloc: fix struct private_module_t definition for C usage
Change-Id: I615294c1b2fcf2fd2a7dc465a4b8351f00c8003c
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Igor Murashkin [Thu, 31 Jan 2013 02:59:46 +0000 (18:59 -0800)]
am
d6b94e50: (-s ours) am
5552deeb: hardware: samsung_slsi: libcamera2: fix metadata symbols: DO NOT MERGE
# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit '
d6b94e50e937003c60bbdf832a0d16337de14b09':
hardware: samsung_slsi: libcamera2: fix metadata symbols: DO NOT MERGE
projects / GitHub / LineageOS / android_hardware_samsung_slsi_exynos5.git / log