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>
The Android Open Source Project [Wed, 31 Oct 2012 16:22:27 +0000 (09:22 -0700)]
am
4ed896ce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
4ed896ce6a2e53de38d6d00fbe8750e48b2925ff':
The Android Open Source Project [Wed, 31 Oct 2012 16:17:40 +0000 (09:17 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I655ef2dc4e9a7bd82b72287f41ba69a8009720ae
The Android Automerger [Fri, 26 Oct 2012 23:22:58 +0000 (16:22 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sungjoong Kang [Thu, 25 Oct 2012 23:06:37 +0000 (16:06 -0700)]
am
0ad5fc61: am
34d2b94a: hardware: samsung_slsi: libcamera2: Fix flash torch mode
* commit '
0ad5fc615d65b3730af0f5324ab77608bdec0c15':
hardware: samsung_slsi: libcamera2: Fix flash torch mode
Sungjoong Kang [Thu, 25 Oct 2012 23:04:33 +0000 (16:04 -0700)]
am
34d2b94a: hardware: samsung_slsi: libcamera2: Fix flash torch mode
* commit '
34d2b94a1d314524aa47d1c9071d9b5027332d65':
hardware: samsung_slsi: libcamera2: Fix flash torch mode
Sungjoong Kang [Thu, 25 Oct 2012 06:55:16 +0000 (23:55 -0700)]
hardware: samsung_slsi: libcamera2: Fix flash torch mode
This patch enables flash torch mode for flashlight apps.
BUG :
7411246
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Change-Id: I293ebf1899d396ca3fd1f4a2c2e9d9e97e99ccc1
The Android Automerger [Thu, 25 Oct 2012 20:42:28 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sungjoong Kang [Thu, 25 Oct 2012 02:50:44 +0000 (19:50 -0700)]
am
d8a9ba56: am
c48f0170: hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
* commit '
d8a9ba56c466363a667db929d6c7e4d7f1387456':
hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
Sungjoong Kang [Thu, 25 Oct 2012 02:50:43 +0000 (19:50 -0700)]
am
254446de: am
ca714238: hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
* commit '
254446de077e616565bda36a20f54d7d7004b744':
hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
Sungjoong Kang [Thu, 25 Oct 2012 02:48:55 +0000 (19:48 -0700)]
am
c48f0170: hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
* commit '
c48f0170bf56ff4911998bc531e8547bcf0d024f':
hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
Sungjoong Kang [Thu, 25 Oct 2012 02:48:55 +0000 (19:48 -0700)]
am
ca714238: hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
* commit '
ca714238a7b555c412637d25006c17f1f0ce2751':
hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
Sungjoong Kang [Wed, 24 Oct 2012 06:50:12 +0000 (23:50 -0700)]
hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
Resets AF state on AF mode change.
AF cancellation works properly in manual(infinite) mode.
Removed some compile warnings.
BUG :
6970465
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Change-Id: I9d577c5f57a0cebd31fb50954fee555722bae6a7
Sungjoong Kang [Fri, 12 Oct 2012 03:11:50 +0000 (20:11 -0700)]
hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
This patch synchornizes AF mode metadata and trigger actions.
BUG:
7318812
Change-Id: I0db3fdf0f85a37bc1c6e0242bde7cba6c69e2746
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
The Android Automerger [Wed, 24 Oct 2012 23:57:04 +0000 (16:57 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Benoit Goby [Wed, 24 Oct 2012 19:42:53 +0000 (12:42 -0700)]
am
366d3ea9: am
56208452: hwc: Add properties to control hdcp and color range
* commit '
366d3ea9d2fa91d58e5f06b8d9c99cef45db0917':
hwc: Add properties to control hdcp and color range
Benoit Goby [Wed, 24 Oct 2012 19:40:57 +0000 (12:40 -0700)]
am
56208452: hwc: Add properties to control hdcp and color range
* commit '
56208452f4f55fbb2b8e39355f5308fe08603e6e':
hwc: Add properties to control hdcp and color range
Benoit Goby [Wed, 24 Oct 2012 00:49:52 +0000 (17:49 -0700)]
hwc: Add properties to control hdcp and color range
Bug:
7395373
Bug:
7259555
Change-Id: Ib8280a892bce123b165df51c5746775e2cf03bdf
The Android Automerger [Tue, 23 Oct 2012 23:47:11 +0000 (16:47 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Younghwan Joo [Tue, 23 Oct 2012 23:25:18 +0000 (16:25 -0700)]
am
dc3932a6: am
a0648fc7: hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
* commit '
dc3932a6f257c1ed958cd9262eff41293c900096':
hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
Younghwan Joo [Tue, 23 Oct 2012 23:25:17 +0000 (16:25 -0700)]
am
64335cdc: am
6a87e47a: hardware: samsung_slsi: libcamera2: clipping fd score to the max score
* commit '
64335cdc68ea0037f7d03ff60d0e581ed7dcf24a':
hardware: samsung_slsi: libcamera2: clipping fd score to the max score
Younghwan Joo [Tue, 23 Oct 2012 23:22:15 +0000 (16:22 -0700)]
am
a0648fc7: hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
* commit '
a0648fc71e705cf211caa991639e2a559e1498d9':
hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
Younghwan Joo [Tue, 23 Oct 2012 23:22:04 +0000 (16:22 -0700)]
am
6a87e47a: hardware: samsung_slsi: libcamera2: clipping fd score to the max score
* commit '
6a87e47a1b93226f778d859a37b0e4655785a4a8':
hardware: samsung_slsi: libcamera2: clipping fd score to the max score
Younghwan Joo [Tue, 23 Oct 2012 09:49:50 +0000 (18:49 +0900)]
hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
This patch is to change aeMode in case of video snapshot to disable flash
sequence even received capture intent is not video snapshot but still capture.
A UI mode value of flash is updated only at preview and recording status.
BUG :
7396371
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
Change-Id: I4ce5a2b67c4590de9f896573c37387701afcd202
Younghwan Joo [Thu, 18 Oct 2012 06:21:19 +0000 (15:21 +0900)]
hardware: samsung_slsi: libcamera2: clipping fd score to the max score
This patch is to clip fd score if the score is over the android max fd score
(100). If a fd score exceeds to 100, that value is fixed to 100.
BUG :
7368020
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
Change-Id: Ieae601cce47d79bcf79bc6e2d80a9ab24a1bb937
The Android Automerger [Tue, 23 Oct 2012 13:59:34 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sungjoong Kang [Mon, 22 Oct 2012 23:55:29 +0000 (16:55 -0700)]
am
61752cf1: am
3c17a3f7: hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
* commit '
61752cf12b26800c4ca3b062a6924e503d9bfc23':
hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
Sungjoong Kang [Mon, 22 Oct 2012 23:53:17 +0000 (16:53 -0700)]
am
3c17a3f7: hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
* commit '
3c17a3f79068fef751c777a7c13830d23e5f51cf':
hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
Sungjoong Kang [Mon, 22 Oct 2012 21:39:49 +0000 (14:39 -0700)]
hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
Add support for 24 and 25 fps modes.
Fix bug on applying maximum fps parameter.
BUG :
7385305
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Change-Id: I005f87da69ca12d408b51d46f1fbd75d1a1a6cc5
The Android Automerger [Fri, 19 Oct 2012 13:59:48 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Greg Hackmann [Fri, 19 Oct 2012 04:07:18 +0000 (21:07 -0700)]
am
0bf23a4c: am
92b0aadb: hwc: adjust protected content scaling for gscaler width constraints
* commit '
0bf23a4c6f54333c896f74a7d434a7c15adf99a6':
hwc: adjust protected content scaling for gscaler width constraints
Greg Hackmann [Fri, 19 Oct 2012 04:05:06 +0000 (21:05 -0700)]
am
92b0aadb: hwc: adjust protected content scaling for gscaler width constraints
* commit '
92b0aadb2237196ee193c6500c6f864c8497c97a':
hwc: adjust protected content scaling for gscaler width constraints
Greg Hackmann [Thu, 18 Oct 2012 17:37:59 +0000 (10:37 -0700)]
hwc: adjust protected content scaling for gscaler width constraints
Protected content cannot be sent through the GPU. Instead slightly
over-scale to meet the Gscaler's 32-pixel alignment constraint and crop
back to the requested display frame.
Also move the minimum-width check to prevent a potential divide-by-zero
in the padding calculations.
Bug:
7365351
Change-Id: Ia0807fe6c4a6c25364fe08ed1f2eb223f3cb0d4e
Signed-off-by: Greg Hackmann <ghackmann@google.com>
The Android Automerger [Thu, 18 Oct 2012 13:59:48 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
James Dong [Thu, 18 Oct 2012 03:21:45 +0000 (20:21 -0700)]
am
895156de: am
d08bf0b2: Merge "Added error handling in the state change from "Load state" to "Idle state"." into jb-mr1-dev
* commit '
895156dea6431fec87200f3b943abafe19c152c2':
Added error handling in the state change from "Load state" to "Idle state".
James Dong [Thu, 18 Oct 2012 03:19:41 +0000 (20:19 -0700)]
am
d08bf0b2: Merge "Added error handling in the state change from "Load state" to "Idle state"." into jb-mr1-dev
* commit '
d08bf0b27662d58d1768123dc5e370322fc0308a':
Added error handling in the state change from "Load state" to "Idle state".
James Dong [Thu, 18 Oct 2012 03:16:05 +0000 (20:16 -0700)]
Merge "Added error handling in the state change from "Load state" to "Idle state"." into jb-mr1-dev
Sungjoong Kang [Thu, 18 Oct 2012 00:45:50 +0000 (17:45 -0700)]
am
770097a8: am
0757ed8e: hardware: samsung_slsi: libcamera2: Add 15fps mode support
* commit '
770097a8c0ab093e347f5d7c28c5b7467cfff440':
hardware: samsung_slsi: libcamera2: Add 15fps mode support
projects / GitHub / LineageOS / android_hardware_samsung_slsi_exynos5.git / log