Ricardo Cerqueira [Wed, 24 Jul 2013 22:40:06 +0000 (23:40 +0100)]
Merge tag 'android-4.3_r2.1' into cm-10.2
Android 4.3 release 2.1
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
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
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
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 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: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
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>
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 [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
Steve Kondik [Thu, 18 Apr 2013 04:43:17 +0000 (21:43 -0700)]
Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/hardware/samsung_slsi/exynos5 into cm-10.1
Android 4.2.2 release 1.2
# gpg: Signature made Wed 17 Apr 2013 01:00:33 PM PDT using DSA key ID
9AB10E78
# gpg: Can't check signature: public key not found
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 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 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 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 [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 [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 [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 [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: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 [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
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
Igor Murashkin [Thu, 31 Jan 2013 02:57:18 +0000 (18:57 -0800)]
am
5552deeb: hardware: samsung_slsi: libcamera2: fix metadata symbols: DO NOT MERGE
# Via Igor Murashkin
* commit '
5552deebff413d7ef0e3bc308231406057554bd6':
hardware: samsung_slsi: libcamera2: fix metadata symbols: DO NOT MERGE
Igor Murashkin [Wed, 28 Nov 2012 00:24:58 +0000 (16:24 -0800)]
hardware: samsung_slsi: libcamera2: fix metadata symbols: DO NOT MERGE
Change-Id: I2088c777fa0ac6841189d07c520b5607fc898021
Rebecca Schultz Zavin [Wed, 16 Jan 2013 19:38:59 +0000 (11:38 -0800)]
Merge "Add chunk heap, use it for gralloc buffers"
Rebecca Schultz Zavin [Wed, 9 Jan 2013 23:37:04 +0000 (15:37 -0800)]
Add chunk heap, use it for gralloc buffers
Rather than allocating buffers solely from system memory
we will now attempt to first allocate them out of a specific
graphics carveout. If there isn't space for a buffer in the
carveout the system heap will be used instead.
Change-Id: I30844123910209a0201c9462fb4776f123537e50
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Greg Hackmann [Fri, 11 Jan 2013 23:13:38 +0000 (15:13 -0800)]
Merge changes I2d46ea67,I495816ec,I652b6edb,Ia465f8bc,I575bef5d,I75f0d096,I28fa1db0,Ie5931a15
* changes:
omx: use hardware CSC for encoding surface textures
omx: move csc (de)initialization to common venc
omx: handle csc errors
omx: always set ion fds for encoder's csc target buffers
csc: add csc_set_method()
csc: handle Gscaler errors
csc: recognize custom ARGB_8888 pixel format
csc: fix custom ARGB_8888 pixel format's name
Greg Hackmann [Tue, 8 Jan 2013 17:44:32 +0000 (09:44 -0800)]
omx: use hardware CSC for encoding surface textures
Shares Gscaler 3 with HDMI
Change-Id: I2d46ea67ad105c98f09ab6aa6f298441c4361b5c
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Tue, 8 Jan 2013 20:27:12 +0000 (12:27 -0800)]
omx: move csc (de)initialization to common venc
Change-Id: I495816ec592ecebdcceae760b1c1e90c26b223da
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Mon, 10 Dec 2012 23:29:38 +0000 (15:29 -0800)]
omx: handle csc errors
Change-Id: I652b6edb9687ec063ec2b110c70031e821d34e7f
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Fri, 30 Nov 2012 22:57:24 +0000 (14:57 -0800)]
omx: always set ion fds for encoder's csc target buffers
Change-Id: Ia465f8bcce7ea1b68088a9443d26d48bc90a24a3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Tue, 8 Jan 2013 20:30:39 +0000 (12:30 -0800)]
csc: add csc_set_method()
Change-Id: I575bef5d62ae6414c43dac7d9fcdf58978850a93
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Mon, 10 Dec 2012 23:28:45 +0000 (15:28 -0800)]
csc: handle Gscaler errors
Change-Id: I75f0d0966e9f7ef10068645df0f41fa6b837c517
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Thu, 3 Jan 2013 19:25:45 +0000 (11:25 -0800)]
csc: recognize custom ARGB_8888 pixel format
Map to V4L2 RGB32 which the gsc kernel driver interprets as XRGB
Change-Id: I28fa1db0b882bab120254337f40b3172074d4eca
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Thu, 3 Jan 2013 19:22:37 +0000 (11:22 -0800)]
csc: fix custom ARGB_8888 pixel format's name
Change-Id: Ie5931a15bcfcfc9c2bdcad416987459d8f85fc2b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Eino-Ville Talvala [Mon, 7 Jan 2013 18:27:16 +0000 (10:27 -0800)]
Merge "Camera: Fix duplicated code."
Eino-Ville Talvala [Fri, 4 Jan 2013 22:26:49 +0000 (14:26 -0800)]
Camera: Fix duplicated code.
Due to two identical commits (
15fd82319b and
6d8e5b08) getting merged
into jb-mr1-dev and master, duplicate code ended up in the camera
library after the second commit automerged into master.
Remove the duplicate lines to fix CTS failure.
Change-Id: Id91e3c9775f7191d1725cb6866fd2d972c3a0584
Greg Hackmann [Thu, 3 Jan 2013 21:55:51 +0000 (13:55 -0800)]
omx: don't log encoder input buffers as errors
Change-Id: I400d2e2b2276e60efaacacaaa74fd03582bc68e6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Dima Zavin [Wed, 5 Dec 2012 22:59:22 +0000 (14:59 -0800)]
gralloc/hwc: read the screen res from the framebuffer modes list
Change-Id: Icd69c79b85ec5ce4a4ff444a98afc0da4e5c0a87
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Mon, 10 Dec 2012 22:42:05 +0000 (14:42 -0800)]
omx: basecomponent: signal abendStateEvent if GetResource fails
This always happens if the user tries to do multiple encoding
sessions at the same time.
Change-Id: I464b06b170de71ae77e43f76cb6f058ae95b703c
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Thu, 6 Dec 2012 23:03:40 +0000 (15:03 -0800)]
Merge changes I456d9ef6,I593c0231
* changes:
hwc: do not require hdmi
hwc: do not require manta to build
Dima Zavin [Wed, 5 Dec 2012 22:33:59 +0000 (14:33 -0800)]
hwc: do not require hdmi
Change-Id: I456d9ef6ea416a14b52b9e5548e9b469a2167696
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Wed, 5 Dec 2012 22:14:50 +0000 (14:14 -0800)]
hwc: do not require manta to build
Change-Id: I593c0231305cc28d2d47bf7a56b7dc786267a36a
Signed-off-by: Dima Zavin <dima@android.com>
Igor Murashkin [Wed, 28 Nov 2012 00:24:58 +0000 (16:24 -0800)]
hardware: samsung_slsi: libcamera2: fix metadata symbols
Change-Id: I2088c777fa0ac6841189d07c520b5607fc898021
SeungBeom Kim [Thu, 29 Nov 2012 20:51:53 +0000 (12:51 -0800)]
am
7ab1561c: am
e1b99ca8: exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.
* commit '
7ab1561c1be4976ba3be1e4992c480b4a20bd8e8':
exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.
SeungBeom Kim [Thu, 29 Nov 2012 20:45:48 +0000 (12:45 -0800)]
am
e1b99ca8: exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.
* commit '
e1b99ca8589f7f5bc0b019f7b50b8776a8f85bf0':
exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.
Jean-Baptiste Queru [Wed, 28 Nov 2012 18:49:05 +0000 (10:49 -0800)]
am
9e30117d: Merge from AOSP
* commit '
9e30117d8a94bddafe135bd9f50af8b3ac7d2e99':
Remove unnecessary dependency on keystore_client
Jean-Baptiste Queru [Wed, 28 Nov 2012 18:45:54 +0000 (10:45 -0800)]
Merge from AOSP
Change-Id: I885abca951326c884d6e64536ebaa3da0220d461
SeungBeom Kim [Fri, 16 Nov 2012 04:03:45 +0000 (13:03 +0900)]
exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.
Add OMX_IndexParamVideoIntraRefresh support, with "Cyclic intra marcoblock refresh" mode support only.
Don't support "Adaptive intra-refresh".
o related-to-bug:
7524845
Change-Id: Id47c0cd3831db6fdb4e46ccece8f8d6f955d777a
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Benoit Goby [Wed, 28 Nov 2012 02:36:12 +0000 (18:36 -0800)]
resolved conflicts for merge of
88f05e8d to master
Change-Id: Ib18aebd1c0f4f3ace3d7307109fcc6ae5c7a7d65
Dima Zavin [Wed, 28 Nov 2012 01:33:35 +0000 (17:33 -0800)]
am
69830d60: am
0183af75: Merge "omx: basecomponent: signal abendStateEvent if componentInit fails" into jb-mr1.1-dev
* commit '
69830d602d844af99dcbc9fa09629cc27e505e3c':
omx: basecomponent: signal abendStateEvent if componentInit fails
Benoit Goby [Tue, 27 Nov 2012 20:56:02 +0000 (12:56 -0800)]
am
5280dde0: Merge "hwc: Hide layer1 if the FB_TAGET layer is not needed" into jb-mr1.1-dev
* commit '
5280dde0bf97c9f3f0ba6bde0a3ee890bb281074':
hwc: Hide layer1 if the FB_TAGET layer is not needed
Benoit Goby [Tue, 27 Nov 2012 20:51:54 +0000 (12:51 -0800)]
Merge "hwc: Hide layer1 if the FB_TAGET layer is not needed" into jb-mr1.1-dev
Dima Zavin [Tue, 27 Nov 2012 19:36:39 +0000 (11:36 -0800)]
am
0183af75: Merge "omx: basecomponent: signal abendStateEvent if componentInit fails" into jb-mr1.1-dev
* commit '
0183af759fed11a4cb388c7045dc57cce4813191':
omx: basecomponent: signal abendStateEvent if componentInit fails
Dima Zavin [Tue, 27 Nov 2012 18:03:46 +0000 (10:03 -0800)]
Merge "omx: basecomponent: signal abendStateEvent if componentInit fails" into jb-mr1.1-dev
SeungBeom Kim [Tue, 20 Nov 2012 21:39:23 +0000 (13:39 -0800)]
am
3a0eba15: am
a7fc5930: exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
* commit '
3a0eba15a8d165f8a75ace07cbbe74c43555bcb7':
exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
SeungBeom Kim [Tue, 20 Nov 2012 21:36:43 +0000 (13:36 -0800)]
am
a7fc5930: exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
* commit '
a7fc593060b63bdeb9c3c5295157b04944d2a524':
exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
SeungBeom Kim [Tue, 20 Nov 2012 03:33:33 +0000 (12:33 +0900)]
exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
Add config dynamic change of "encode component".
Bug:
7546690
Change-Id: I82b043d51aa8295929201ce26c2b1afd5bcdb0e8
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Greg Hackmann [Tue, 2 Oct 2012 18:39:13 +0000 (11:39 -0700)]
hwc: set retire fence fds
Change-Id: Iece6483e6402a9a425086b8ee8e67e17909b7d8a
Dima Zavin [Thu, 8 Nov 2012 22:30:43 +0000 (14:30 -0800)]
omx: basecomponent: signal abendStateEvent if componentInit fails
Bug:
7261738
Change-Id: I1baf82b37120207de9f757a66e76185e68a81b80
Signed-off-by: Dima Zavin <dima@android.com>
Kenny Root [Wed, 14 Nov 2012 23:52:02 +0000 (15:52 -0800)]
Remove unnecessary dependency on keystore_client
Change-Id: I801740653a6a13cb85d85204e2c8fa1b5ea2f879
(cherry picked from commit
60b72f63f6d36cfc87319bd720a4467fece6a548)
Kenny Root [Wed, 14 Nov 2012 23:53:20 +0000 (15:53 -0800)]
Merge "Remove unnecessary dependency on keystore_client"
Kenny Root [Wed, 14 Nov 2012 23:52:02 +0000 (15:52 -0800)]
Remove unnecessary dependency on keystore_client
Change-Id: I801740653a6a13cb85d85204e2c8fa1b5ea2f879
Benoit Goby [Tue, 30 Oct 2012 23:05:34 +0000 (16:05 -0700)]
hwc: Hide layer1 if the FB_TAGET layer is not needed
Leave layer1 enabled but hide it when not needed because if both layers
get disabled, the hdmi mixer and phy will get powered off.
Bug:
7363167
Change-Id: I4a969be7fb7877b05e866488d71f478c8f1c0fb4
The Android Open Source Project [Tue, 6 Nov 2012 20:27:31 +0000 (12:27 -0800)]
am
29434681: (-s ours) am
f97103b5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
29434681bcb2cf348411f790887473a41855baf8':
The Android Open Source Project [Tue, 6 Nov 2012 20:24:31 +0000 (12:24 -0800)]
am
f97103b5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
f97103b5f0e5a65a81f60bbe39cd563b655ce020':
The Android Open Source Project [Tue, 6 Nov 2012 20:17:45 +0000 (12:17 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I088f7356b684381f971b7e9f6773ba24f7f9b62a
The Android Open Source Project [Fri, 2 Nov 2012 14:30:19 +0000 (07:30 -0700)]
am
1273f1b7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
1273f1b7ace1772bc115f4252f2925de0c5c102d':
The Android Open Source Project [Fri, 2 Nov 2012 14:28:26 +0000 (07:28 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie34407add6de1a599529f03ac8954c792c400fbe
The Android Automerger [Fri, 2 Nov 2012 02:05:29 +0000 (19:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Rebecca Schultz Zavin [Thu, 1 Nov 2012 22:25:38 +0000 (15:25 -0700)]
am
57b18438: am
d881a0ce: Allocate enough memory for HAL_PIXL_FORMAT_YV12
* commit '
57b18438ad3905465813ea88c05bb0e045a4db86':
Allocate enough memory for HAL_PIXL_FORMAT_YV12
Rebecca Schultz Zavin [Thu, 1 Nov 2012 22:22:24 +0000 (15:22 -0700)]
am
d881a0ce: Allocate enough memory for HAL_PIXL_FORMAT_YV12
* commit '
d881a0ce901d839282ba2d4d724b9ae25c9d4e89':
Allocate enough memory for HAL_PIXL_FORMAT_YV12
Rebecca Schultz Zavin [Thu, 1 Nov 2012 00:05:48 +0000 (17:05 -0700)]
Allocate enough memory for HAL_PIXL_FORMAT_YV12
Previously we were not allocating enough memory to align
the uv planes to 16 pixels.
We were allocating:
h * align(w,16) * 3 / 2 bytes
This should be:
h * align(w,16) + h * align(align(w,16)/2, 16)
Bug:
7431048
Change-Id: Iaba969795e8d20c29ee0b703af5dd884a4c88d2e
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
projects / GitHub / LineageOS / android_hardware_samsung_slsi_exynos5.git / log