Younghwan Joo [Fri, 5 Oct 2012 23:43:43 +0000 (16:43 -0700)]
am
d8b4402b: am
ddf663f8: hardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)
* commit '
d8b4402b2eda70d8f47c3ec3c13954ca77554b2b':
hardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)
Sungjoong Kang [Fri, 5 Oct 2012 23:43:42 +0000 (16:43 -0700)]
am
87a2bf81: am
ca31bf21: hardware: samsung_slsi: libcamera2: Supports AE region
* commit '
87a2bf81315d18dfc897b49cba4398dbfe5aef6d':
hardware: samsung_slsi: libcamera2: Supports AE region
Sungjoong Kang [Fri, 5 Oct 2012 23:43:41 +0000 (16:43 -0700)]
am
8deec2b9: am
6caa0c80: hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error
* commit '
8deec2b90f8e09564f785d1e1a3ab0307b62eb10':
hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error
Hyeonmyeong Choi [Fri, 5 Oct 2012 23:43:40 +0000 (16:43 -0700)]
am
816f8ce5: am
87423e56: hardware: samsung_slsi: libcamera2: Support JPEG quality
* commit '
816f8ce55f82f9b7a5ff9c3a23d57384d63da7df':
hardware: samsung_slsi: libcamera2: Support JPEG quality
Sungjoong Kang [Fri, 5 Oct 2012 23:43:40 +0000 (16:43 -0700)]
am
a2d075ba: am
71f3bb38: hardware: samsung_slsi: libcamera2: Fix screen blinking on start
* commit '
a2d075ba2b5339346808161d1a35c935e6ec3ccf':
hardware: samsung_slsi: libcamera2: Fix screen blinking on start
Sungjoong Kang [Fri, 5 Oct 2012 23:43:39 +0000 (16:43 -0700)]
am
9b033d02: am
0066b2cb: hardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates
* commit '
9b033d02f7dc0511d6e9dc95fe329221033022fd':
hardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates
Younghwan Joo [Fri, 5 Oct 2012 23:41:57 +0000 (16:41 -0700)]
am
ddf663f8: hardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)
* commit '
ddf663f88ed7c4729a55a0b4519b2138adf154de':
hardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)
Sungjoong Kang [Fri, 5 Oct 2012 23:41:56 +0000 (16:41 -0700)]
am
ca31bf21: hardware: samsung_slsi: libcamera2: Supports AE region
* commit '
ca31bf2185d8b0550733c1b60278cda076a17a77':
hardware: samsung_slsi: libcamera2: Supports AE region
Sungjoong Kang [Fri, 5 Oct 2012 23:41:56 +0000 (16:41 -0700)]
am
6caa0c80: hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error
* commit '
6caa0c805ef028707af71cb84b6ab11aee67abb5':
hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error
Hyeonmyeong Choi [Fri, 5 Oct 2012 23:41:55 +0000 (16:41 -0700)]
am
87423e56: hardware: samsung_slsi: libcamera2: Support JPEG quality
* commit '
87423e5686296b1938959ff8bf9817490ddee2f1':
hardware: samsung_slsi: libcamera2: Support JPEG quality
Sungjoong Kang [Fri, 5 Oct 2012 23:41:54 +0000 (16:41 -0700)]
am
71f3bb38: hardware: samsung_slsi: libcamera2: Fix screen blinking on start
* commit '
71f3bb3840977f3339733a6945927f0f70758731':
hardware: samsung_slsi: libcamera2: Fix screen blinking on start
Sungjoong Kang [Fri, 5 Oct 2012 23:41:53 +0000 (16:41 -0700)]
am
0066b2cb: hardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates
* commit '
0066b2cb831c1a4e20edd7339cc1bc790e0d968c':
hardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates
Younghwan Joo [Fri, 5 Oct 2012 04:36:28 +0000 (13:36 +0900)]
hardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)
This patch is to matching pre-flash and main-flash. In flash scenario,
Firing main flash have to be followed by firing pre-flash.
This commit is to add previous patch. (#25402, patchset 3)
BUG :
7276572
Change-Id: I0290519f791802705a20309be20e910678f3df24
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
Sungjoong Kang [Fri, 5 Oct 2012 02:38:41 +0000 (19:38 -0700)]
hardware: samsung_slsi: libcamera2: Supports AE region
With this patch, selecting AE region by touching screen
will be enabled.
BUG:
7286132
Change-Id: Ifffe5589081ed4d8da47b663e427897bc87b0cce
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Sungjoong Kang [Fri, 5 Oct 2012 01:19:14 +0000 (18:19 -0700)]
hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error
This bug fixes AF failure on changing to AF from CAF mode.
BUG:
7287500
Change-Id: Idae0d247787ad3bb7dfe68e4f1d16f39cfb68fbd
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Hyeonmyeong Choi [Thu, 4 Oct 2012 07:34:55 +0000 (16:34 +0900)]
hardware: samsung_slsi: libcamera2: Support JPEG quality
This patch support JPEG quality and thumbnail quality.
The default values of JPEG and thumbnail quality are 100.
Change-Id: I4dc1f21b5b36cb21b3500646817378a0d91e49d6
Signed-off-by: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Sungjoong Kang [Thu, 4 Oct 2012 20:37:07 +0000 (13:37 -0700)]
hardware: samsung_slsi: libcamera2: Fix screen blinking on start
This patch fixes screen blinking on starting camera app
BUG:
7288978
Change-Id: Iba3e2de36da898571d42db1aefb8675602bce393
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Sungjoong Kang [Thu, 4 Oct 2012 20:31:13 +0000 (13:31 -0700)]
hardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates
Fixed JPEG GPS Coordinates error due to unit mismatch.
BUG:
7287793
Change-Id: Ie063f21e8a684fe7d5c6e56ca97b907d8fb302a9
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Igor Murashkin [Fri, 5 Oct 2012 20:52:36 +0000 (13:52 -0700)]
am
99a9a1cf: am
faa88263: Merge "hardware: samsung_slsi: libcamera2: Correct front and rear camera info" into jb-mr1-dev
* commit '
99a9a1cff3238bd72da21292801468f7d5d7dfb8':
hardware: samsung_slsi: libcamera2: Correct front and rear camera info
Igor Murashkin [Fri, 5 Oct 2012 20:49:52 +0000 (13:49 -0700)]
am
faa88263: Merge "hardware: samsung_slsi: libcamera2: Correct front and rear camera info" into jb-mr1-dev
* commit '
faa88263bc466e2a064e3968ba290f8f16882e98':
hardware: samsung_slsi: libcamera2: Correct front and rear camera info
Igor Murashkin [Fri, 5 Oct 2012 20:46:18 +0000 (13:46 -0700)]
Merge "hardware: samsung_slsi: libcamera2: Correct front and rear camera info" into jb-mr1-dev
Sungjoong Kang [Fri, 5 Oct 2012 04:51:47 +0000 (21:51 -0700)]
hardware: samsung_slsi: libcamera2: Correct front and rear camera info
This patch corrects AF, AE and Scene mode parameters
for front and rear camera each.
BUG:
7287905
Change-Id: I95c16293530903f3d83170bdb172e67f9adcbaff
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Sanghee Kim [Fri, 5 Oct 2012 17:24:21 +0000 (10:24 -0700)]
am
8d0c79ee: am
7b4c1329: hardware: exynos5: hwc: add gsc\'s width alignment constraint.
* commit '
8d0c79ee29cda5c3a1f0b0ef682e9c1ecb1c1388':
hardware: exynos5: hwc: add gsc's width alignment constraint.
Sanghee Kim [Fri, 5 Oct 2012 17:22:39 +0000 (10:22 -0700)]
am
7b4c1329: hardware: exynos5: hwc: add gsc\'s width alignment constraint.
* commit '
7b4c1329920d7c9a804f70cca33285ed60ad284b':
hardware: exynos5: hwc: add gsc's width alignment constraint.
Sanghee Kim [Fri, 5 Oct 2012 01:44:36 +0000 (18:44 -0700)]
hardware: exynos5: hwc: add gsc's width alignment constraint.
1.M2M case
GSC's dst width should be aligned with 32 pixels in case of RGB888.
Bug:
7276111
Change-Id: I563f7367b7f368d24194d178c8b0ca3b445b6ec3
Signed-off-by: Sanghee Kim <haya93@samsung.com>
The Android Open Source Project [Fri, 5 Oct 2012 15:20:33 +0000 (08:20 -0700)]
am
3e2096a7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
3e2096a78b28ddf3068dafebcefb448a933a5d14':
The Android Open Source Project [Fri, 5 Oct 2012 15:17:07 +0000 (08:17 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Iff019a3d002fa30cab129b77dc2f1d1ab2f162ba
The Android Automerger [Fri, 5 Oct 2012 13:59:45 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Greg Hackmann [Thu, 4 Oct 2012 21:52:47 +0000 (14:52 -0700)]
am
356efb56: am
89bb5743: hwc: don\'t logspam about unexpected formats
* commit '
356efb566bd50e80fe79c88d1565bf73c361fbd9':
hwc: don't logspam about unexpected formats
Greg Hackmann [Thu, 4 Oct 2012 21:50:46 +0000 (14:50 -0700)]
am
89bb5743: hwc: don\'t logspam about unexpected formats
* commit '
89bb5743fcbcf78bbc517e5bd690de3996981fd4':
hwc: don't logspam about unexpected formats
Greg Hackmann [Thu, 4 Oct 2012 21:42:44 +0000 (14:42 -0700)]
hwc: don't logspam about unexpected formats
Bug:
7289360
Change-Id: Ib562e94ee127980a1910cbb2ce4ed206806a7c5d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Rebecca Schultz Zavin [Thu, 4 Oct 2012 19:28:32 +0000 (12:28 -0700)]
am
03cc9455: am
5258c21c: Fix bug in gralloc
* commit '
03cc945508b8f720b3c196a84804bf2cac7a659c':
Fix bug in gralloc
Rebecca Schultz Zavin [Thu, 4 Oct 2012 18:42:25 +0000 (11:42 -0700)]
am
5258c21c: Fix bug in gralloc
* commit '
5258c21c1bdeb412c4ad7982d95e587a121f00fc':
Fix bug in gralloc
Rebecca Schultz Zavin [Thu, 4 Oct 2012 18:23:56 +0000 (11:23 -0700)]
Fix bug in gralloc
If buffers were allocated and then locked without ever
being passed to another process lock would return NULL
instead of a pointer to the buffer. Instead map the buffer
from lock if it hasn't already been done by register. Also
check in free and unmap the buffer it is mapped.
Change-Id: I3fe670ccb429f3de5f2e4dd07768414e70a02036
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Greg Hackmann [Thu, 4 Oct 2012 18:20:21 +0000 (11:20 -0700)]
am
ec5c13bd: am
fdf73d2f: Merge changes I28fc9f33,I7594e39e,I831e4839 into jb-mr1-dev
* commit '
ec5c13bdca77964be9f6a0622a8f76e3fa54cb0e':
hwc: keep gscaler streaming on between frames
libgscaler: don't reconfigure m2m gscaler every frame
libgscaler: split stop operation into discrete wait and stop operations
Greg Hackmann [Thu, 4 Oct 2012 18:18:44 +0000 (11:18 -0700)]
am
fdf73d2f: Merge changes I28fc9f33,I7594e39e,I831e4839 into jb-mr1-dev
* commit '
fdf73d2f9ff2aad79d827b95f99f57538d7fde3d':
hwc: keep gscaler streaming on between frames
libgscaler: don't reconfigure m2m gscaler every frame
libgscaler: split stop operation into discrete wait and stop operations
Greg Hackmann [Thu, 4 Oct 2012 18:15:19 +0000 (11:15 -0700)]
Merge changes I28fc9f33,I7594e39e,I831e4839 into jb-mr1-dev
* changes:
hwc: keep gscaler streaming on between frames
libgscaler: don't reconfigure m2m gscaler every frame
libgscaler: split stop operation into discrete wait and stop operations
Greg Hackmann [Wed, 3 Oct 2012 23:28:19 +0000 (16:28 -0700)]
hwc: keep gscaler streaming on between frames
Reconfiguring requires stopping and starting the stream, so only call
gsc_config_exclusive() when the configuration actually needs to be
changed. Use the new gsc_wait_exclusive() operation to wait every frame
but only stop on cleanup.
Bug:
7202379
Change-Id: I28fc9f33a9345c91aef3f82098aeb668893f620e
Signed-off-by: Greg Hackmann <ghackmann@google.com>
The Android Open Source Project [Thu, 4 Oct 2012 14:52:20 +0000 (07:52 -0700)]
am
a1fa1181: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a1fa118111c0750b469153ba004ceb2d0081ceb5':
hardware: samsung_slsi: libcamera2: increase meta length and remove dead code
hwc: Fix video layer colors
hwc: Add support for video overlay
The Android Open Source Project [Thu, 4 Oct 2012 14:48:44 +0000 (07:48 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ia42f0b7dd97e46cfa521b1f57a3635a42464e1a9
The Android Automerger [Thu, 4 Oct 2012 13:59:49 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Younghwan Joo [Thu, 4 Oct 2012 06:58:59 +0000 (23:58 -0700)]
am
a0d57f48: am
1aebf6df: hardware: samsung_slsi: libcamera2: Change FD filtering method
* commit '
a0d57f48f12c331e60e0573c55a514a0eba4cc08':
hardware: samsung_slsi: libcamera2: Change FD filtering method
Younghwan Joo [Thu, 4 Oct 2012 06:58:58 +0000 (23:58 -0700)]
am
7d1a32f6: am
cdd53a9f: hardware: samsung_slsi: libcamera2: make sync between pre and main flash
* commit '
7d1a32f65f620dcb82751e24da09ff12c9e6697d':
hardware: samsung_slsi: libcamera2: make sync between pre and main flash
Hyeonmyeong Choi [Thu, 4 Oct 2012 06:58:57 +0000 (23:58 -0700)]
am
1c8f5163: am
408f6161: hardware: samsung_slsi: libcamera2: Fixed crop region mismatch
* commit '
1c8f51638635052e4d54db8e66a332d4f98e0bee':
hardware: samsung_slsi: libcamera2: Fixed crop region mismatch
Hyeonmyeong Choi [Thu, 4 Oct 2012 06:58:57 +0000 (23:58 -0700)]
am
25d9bc8a: am
ce77365b: hardware: samsung_slsi: libcamera2: VDIS disable bug fix
* commit '
25d9bc8aef93c36c781a45af58604e257df1943c':
hardware: samsung_slsi: libcamera2: VDIS disable bug fix
Younghwan Joo [Thu, 4 Oct 2012 06:56:48 +0000 (23:56 -0700)]
am
1aebf6df: hardware: samsung_slsi: libcamera2: Change FD filtering method
* commit '
1aebf6df3e4ec3b3487da96797a742dc14bf355a':
hardware: samsung_slsi: libcamera2: Change FD filtering method
Younghwan Joo [Thu, 4 Oct 2012 06:56:47 +0000 (23:56 -0700)]
am
cdd53a9f: hardware: samsung_slsi: libcamera2: make sync between pre and main flash
* commit '
cdd53a9f3bfbd35a715b9fe56ff7e3e1c3e32a10':
hardware: samsung_slsi: libcamera2: make sync between pre and main flash
Hyeonmyeong Choi [Thu, 4 Oct 2012 06:56:46 +0000 (23:56 -0700)]
am
408f6161: hardware: samsung_slsi: libcamera2: Fixed crop region mismatch
* commit '
408f6161d88b5b03fbce875a7662b59942851d6c':
hardware: samsung_slsi: libcamera2: Fixed crop region mismatch
Hyeonmyeong Choi [Thu, 4 Oct 2012 06:56:46 +0000 (23:56 -0700)]
am
ce77365b: hardware: samsung_slsi: libcamera2: VDIS disable bug fix
* commit '
ce77365bcdde50b2be626f3db1bf2cd77f2ef715':
hardware: samsung_slsi: libcamera2: VDIS disable bug fix
Sungjoong Kang [Thu, 4 Oct 2012 05:54:16 +0000 (22:54 -0700)]
am
2be6441c: am
d0a2bb69: hardware: samsung_slsi: libcamera2: Protection from re-releasing stream
* commit '
2be6441c61e8ab0a1667e7b68111d8ae4483c03b':
hardware: samsung_slsi: libcamera2: Protection from re-releasing stream
Sungjoong Kang [Thu, 4 Oct 2012 05:54:15 +0000 (22:54 -0700)]
am
0c49dbea: am
69d1e6e9: hardware: samsung_slsi: libcamera2: Fix missing fields in EXIF
* commit '
0c49dbeac7cd4f85395832b79946bd3b54bfa224':
hardware: samsung_slsi: libcamera2: Fix missing fields in EXIF
Sungjoong Kang [Thu, 4 Oct 2012 05:54:14 +0000 (22:54 -0700)]
am
04eb445d: am
572470e2: hardware: samsung_slsi: libcamera2: Fix black frame after night shot
* commit '
04eb445ddb71bc7aacbb9c0e7c181c2304b49862':
hardware: samsung_slsi: libcamera2: Fix black frame after night shot
Sungjoong Kang [Thu, 4 Oct 2012 05:52:03 +0000 (22:52 -0700)]
am
d0a2bb69: hardware: samsung_slsi: libcamera2: Protection from re-releasing stream
* commit '
d0a2bb696153f2a6e6cadd6ec177c244aac0009c':
hardware: samsung_slsi: libcamera2: Protection from re-releasing stream
Sungjoong Kang [Thu, 4 Oct 2012 05:52:02 +0000 (22:52 -0700)]
am
69d1e6e9: hardware: samsung_slsi: libcamera2: Fix missing fields in EXIF
* commit '
69d1e6e9c2036cc231544f61df9ee13e00d1fe0c':
hardware: samsung_slsi: libcamera2: Fix missing fields in EXIF
Sungjoong Kang [Thu, 4 Oct 2012 05:52:01 +0000 (22:52 -0700)]
am
572470e2: hardware: samsung_slsi: libcamera2: Fix black frame after night shot
* commit '
572470e2f220641581282c0d3f199a0faa52f8b7':
hardware: samsung_slsi: libcamera2: Fix black frame after night shot
Rebecca Schultz Zavin [Thu, 4 Oct 2012 05:09:44 +0000 (22:09 -0700)]
am
01042604: am
e9b42242: Merge "Don\'t map gralloc buffers when you allocate them" into jb-mr1-dev
* commit '
010426049f747df65e86dcc9be4a0838fe920380':
Don't map gralloc buffers when you allocate them
Younghwan Joo [Tue, 2 Oct 2012 13:11:53 +0000 (22:11 +0900)]
hardware: samsung_slsi: libcamera2: Change FD filtering method
This patch is to change FD filtering method of cameraHAL. By tuning
FD parameter, All IDs of face those have score above 0 are treated
as faces.
Bug:
7276572
Change-Id: Ideaa5c476397e0da47ee0f17b9c6a50cadf3ab0c
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
Younghwan Joo [Wed, 3 Oct 2012 08:00:15 +0000 (17:00 +0900)]
hardware: samsung_slsi: libcamera2: make sync between pre and main flash
This patch is to matching pre-flash and main-flash. In flash scenario,
Firing main flash have to be followed by firing pre-flash.
Bug:
7276572
Change-Id: I6ba3aede7535c748524b2cd871e0867e06f59f25
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
Hyeonmyeong Choi [Tue, 2 Oct 2012 03:57:42 +0000 (12:57 +0900)]
hardware: samsung_slsi: libcamera2: Fixed crop region mismatch
This patch fix crop region mismatch when crop width is not multiple of 4.
Bug:
7274064
Change-Id: Id24620d93173a509dc25bd0087f541d017f2b67a
Signed-off-by: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Rebecca Schultz Zavin [Thu, 4 Oct 2012 05:07:33 +0000 (22:07 -0700)]
am
e9b42242: Merge "Don\'t map gralloc buffers when you allocate them" into jb-mr1-dev
* commit '
e9b4224251748a74f2d1aebbe9a5b71d6e964158':
Don't map gralloc buffers when you allocate them
Hyeonmyeong Choi [Tue, 2 Oct 2012 04:08:59 +0000 (13:08 +0900)]
hardware: samsung_slsi: libcamera2: VDIS disable bug fix
This patch fix bug that VDIS is disabled when change the resolution at video mode.
Bug:
7274501
Change-Id: Ic7a9ab5666762d29740d359988d276a847b3c597
Signed-off-by: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Sungjoong Kang [Sun, 30 Sep 2012 09:31:54 +0000 (02:31 -0700)]
hardware: samsung_slsi: libcamera2: Protection from re-releasing stream
On releasing stream, check the existence of target stream first
for protection from re-release.
Bug:
7258314
Change-Id: I11f6986203f36ca4f829212b95681d6231e56c37
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Sungjoong Kang [Wed, 3 Oct 2012 07:39:13 +0000 (00:39 -0700)]
hardware: samsung_slsi: libcamera2: Fix missing fields in EXIF
ISO vaule and a few more fields are missing in EXIF sometimes.
This patch resolves it.
Fixed metadata bug in flash mode also.
Bug:
7276514
Change-Id: If077d8c5dc4ec7b6821279996637e4329aa43146
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Sungjoong Kang [Thu, 4 Oct 2012 02:30:25 +0000 (19:30 -0700)]
hardware: samsung_slsi: libcamera2: Fix black frame after night shot
By maintaining proper scene mode during shot-to-shot period,
removed black frames after taking a night shot.
Bug:
7283906
Change-Id: I4778f71c8ed5e73a62a12fc78c15348de27315a1
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Rebecca Schultz Zavin [Thu, 4 Oct 2012 05:03:57 +0000 (22:03 -0700)]
Merge "Don't map gralloc buffers when you allocate them" into jb-mr1-dev
Sungjoong Kang [Thu, 4 Oct 2012 04:41:13 +0000 (21:41 -0700)]
am
68fed6e1: am
c6053426: hardware: samsung_slsi: libcamera2: Use quirk for metering regions
* commit '
68fed6e17ca5e5d801d431877268cae1b3244bba':
hardware: samsung_slsi: libcamera2: Use quirk for metering regions
Sungjoong Kang [Thu, 4 Oct 2012 04:39:24 +0000 (21:39 -0700)]
am
c6053426: hardware: samsung_slsi: libcamera2: Use quirk for metering regions
* commit '
c6053426696191056192ff8ed0218b81fb246a00':
hardware: samsung_slsi: libcamera2: Use quirk for metering regions
Sungjoong Kang [Wed, 3 Oct 2012 23:10:53 +0000 (16:10 -0700)]
hardware: samsung_slsi: libcamera2: Use quirk for metering regions
Added quirk setting for metering regions to ignore crop region.
BUG:
7246065
Change-Id: I379734c56e0e8e8a0dae3808352b9c4f0992b0b2
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Rebecca Schultz Zavin [Wed, 3 Oct 2012 20:24:07 +0000 (13:24 -0700)]
Don't map gralloc buffers when you allocate them
Bug:
7280662
Change-Id: I415be4741396436c1d95380082ab2d5c36b80e81
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Greg Hackmann [Wed, 3 Oct 2012 23:24:35 +0000 (16:24 -0700)]
libgscaler: don't reconfigure m2m gscaler every frame
Reconfiguration happens iff config_exclusive() is called since the last
call to run_exclusive(). Streaming can now stay on until the Gscaler is
reconfigured or explicitly stopped.
Bug:
7202379
Change-Id: I7594e39e01454785098a7abc0b6480df6553f8d0
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Wed, 3 Oct 2012 23:08:12 +0000 (16:08 -0700)]
libgscaler: split stop operation into discrete wait and stop operations
To support keeping Gscaler streaming on between frames
Bug:
7202379
Change-Id: I831e48391a62196dcdd78b86dc2c588cae118f8c
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Younghwan Joo [Wed, 3 Oct 2012 07:48:02 +0000 (16:48 +0900)]
hardware: samsung_slsi: libcamera2: increase meta length and remove dead code
This patch is to increase meta data length to support more fields and remove
unused codes.
BUG :
7276572
Change-Id: I766d7156a477f006ec2f79e28354b23eec0fe674
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
Benoit Goby [Tue, 2 Oct 2012 04:52:29 +0000 (21:52 -0700)]
hwc: Fix video layer colors
The HDMI mixer only supports RGB
Bug:
7123196
Change-Id: I09688589df50527ed95234d0e8f1afca2bd6c648
Benoit Goby [Mon, 1 Oct 2012 07:29:01 +0000 (00:29 -0700)]
hwc: Add support for video overlay
Graphic Layer 1 is always used for the FB layer and Graphic
Layer 0 for the Video layer
Bug:
7123196
Change-Id: Ia4d4bbb10598cd32beac44324025dcae7b6fac19
Younghwan Joo [Wed, 3 Oct 2012 21:32:47 +0000 (14:32 -0700)]
am
58ec4288: am
07b3ad1c: hardware: samsung_slsi: libcamera2: increase meta length and remove dead code
* commit '
58ec42887319680cda866983c5f5eae9917d12e5':
hardware: samsung_slsi: libcamera2: increase meta length and remove dead code
Younghwan Joo [Wed, 3 Oct 2012 21:31:11 +0000 (14:31 -0700)]
am
07b3ad1c: hardware: samsung_slsi: libcamera2: increase meta length and remove dead code
* commit '
07b3ad1ceb45ecff82e1ab272e686243856aa841':
hardware: samsung_slsi: libcamera2: increase meta length and remove dead code
Younghwan Joo [Wed, 3 Oct 2012 07:48:02 +0000 (16:48 +0900)]
hardware: samsung_slsi: libcamera2: increase meta length and remove dead code
This patch is to increase meta data length to support more fields and remove
unused codes.
BUG :
7276572
Change-Id: I766d7156a477f006ec2f79e28354b23eec0fe674
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
Greg Hackmann [Wed, 3 Oct 2012 21:02:41 +0000 (14:02 -0700)]
am
7d5a6376: am
efd9853a: hwc: reuse gscaler device between frames
* commit '
7d5a6376b5ed0c546e911b8933bc666f3d2929c6':
hwc: reuse gscaler device between frames
Greg Hackmann [Wed, 3 Oct 2012 21:02:40 +0000 (14:02 -0700)]
am
26c5365a: am
d6743822: hwc: reserve one gscaler each for FIMD and HDMI
* commit '
26c5365a2d8bb83c413cc1ad8a7ed681fd36d485':
hwc: reserve one gscaler each for FIMD and HDMI
Benoit Goby [Wed, 3 Oct 2012 21:02:39 +0000 (14:02 -0700)]
am
79cd371f: am
59acf952: Merge "hwc: Fix video layer colors" into jb-mr1-dev
* commit '
79cd371f25cf1bd43e8717ab00af7dda07aa8797':
hwc: Fix video layer colors
Benoit Goby [Wed, 3 Oct 2012 21:02:38 +0000 (14:02 -0700)]
am
d1b93b30: am
60b9fbf3: Merge "hwc: Add support for video overlay" into jb-mr1-dev
* commit '
d1b93b30fe4a6e0e73b02ed7c645bde369654f44':
hwc: Add support for video overlay
Greg Hackmann [Wed, 3 Oct 2012 20:54:15 +0000 (13:54 -0700)]
am
efd9853a: hwc: reuse gscaler device between frames
* commit '
efd9853a27a57c13b90fd9c2871aea206d4d6338':
hwc: reuse gscaler device between frames
Greg Hackmann [Wed, 3 Oct 2012 20:54:14 +0000 (13:54 -0700)]
am
d6743822: hwc: reserve one gscaler each for FIMD and HDMI
* commit '
d6743822496f732019c4c16db81e443598763500':
hwc: reserve one gscaler each for FIMD and HDMI
Benoit Goby [Wed, 3 Oct 2012 20:53:55 +0000 (13:53 -0700)]
am
59acf952: Merge "hwc: Fix video layer colors" into jb-mr1-dev
* commit '
59acf952ddeccfd1a8a4d2c102a4fa3bbd87ead4':
hwc: Fix video layer colors
Benoit Goby [Wed, 3 Oct 2012 20:53:55 +0000 (13:53 -0700)]
am
60b9fbf3: Merge "hwc: Add support for video overlay" into jb-mr1-dev
* commit '
60b9fbf32e6a87190b2d6d64f65eb29a8e6775c1':
hwc: Add support for video overlay
Greg Hackmann [Tue, 2 Oct 2012 19:00:42 +0000 (12:00 -0700)]
hwc: reuse gscaler device between frames
The Gscaler device is cleaned up (along with the destination buffers) on
the first frame where it is not needed anymore.
Bug:
7202379
Change-Id: Icb9239a603b46ffb70ce2bba5dd8d998541cf0f5
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Wed, 3 Oct 2012 00:27:25 +0000 (17:27 -0700)]
hwc: reserve one gscaler each for FIMD and HDMI
Prevents FIMD and HDMI from stomping on each other's Gscaler devices
that have been left open
Bug:
7202379
Change-Id: I3f068810a747e45b7c0200bba34c232d9aa54431
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Benoit Goby [Wed, 3 Oct 2012 19:21:23 +0000 (12:21 -0700)]
Merge "hwc: Fix video layer colors" into jb-mr1-dev
Benoit Goby [Wed, 3 Oct 2012 19:21:14 +0000 (12:21 -0700)]
Merge "hwc: Add support for video overlay" into jb-mr1-dev
Rebecca Zavin [Wed, 3 Oct 2012 18:56:46 +0000 (11:56 -0700)]
am
6763d22e: am
6155ddde: Merge "hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks" into jb-mr1-dev
* commit '
6763d22e8d424e065a1025d1f1ae88f36e549863':
hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks
Rebecca Zavin [Wed, 3 Oct 2012 18:51:31 +0000 (11:51 -0700)]
am
6155ddde: Merge "hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks" into jb-mr1-dev
* commit '
6155dddeee557b63e25619719acb460044a22660':
hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks
Rebecca Zavin [Wed, 3 Oct 2012 18:41:07 +0000 (11:41 -0700)]
Merge "hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks" into jb-mr1-dev
Sungjoong Kang [Tue, 2 Oct 2012 04:50:09 +0000 (21:50 -0700)]
hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks
With this patch, HAL will send scene mode override parameters
and quirk parameters for zsl and af mode.
BUG:
7172543
BUG:
7159577
Change-Id: Ia40cf3b600c1ae89a579c3f57f45752cb99ccf3b
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Simon Wilson [Wed, 3 Oct 2012 18:08:52 +0000 (11:08 -0700)]
am
f42521fb: am
c03533ba: clean kernel headers
* commit '
f42521fb1c3335a7dd2403f14b2275b98591a4eb':
clean kernel headers
Simon Wilson [Wed, 3 Oct 2012 18:06:34 +0000 (11:06 -0700)]
am
c03533ba: clean kernel headers
* commit '
c03533ba4afd2c884dd936b127e31e76b0b1d9e3':
clean kernel headers
Simon Wilson [Wed, 3 Oct 2012 16:52:14 +0000 (09:52 -0700)]
clean kernel headers
Bug:
7233428
Change-Id: Ib1ea24fbcea64562abc6e22b23a7d77cad2c1fe7
The Android Open Source Project [Wed, 3 Oct 2012 14:36:28 +0000 (07:36 -0700)]
am
bdbc0676: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
bdbc067685bf527617f5e6d7643ef5836d28655f':
The Android Open Source Project [Wed, 3 Oct 2012 14:34:29 +0000 (07:34 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ib5e744d8e5e05f06065f7650ac51590af9ad2a9e
The Android Automerger [Wed, 3 Oct 2012 13:59:54 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Benoit Goby [Tue, 2 Oct 2012 04:52:29 +0000 (21:52 -0700)]
hwc: Fix video layer colors
The HDMI mixer only supports RGB
Bug:
7123196
Change-Id: I09688589df50527ed95234d0e8f1afca2bd6c648