Greg Hackmann [Tue, 9 Oct 2012 16:01:04 +0000 (09:01 -0700)]
am
84271554: am
ef5f57a2: Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev
* commit '
8427155476615bd3a5a21d34c6d0e97228062fa6':
hwc: always make forward progress in fimd set()
Greg Hackmann [Tue, 9 Oct 2012 15:59:40 +0000 (08:59 -0700)]
am
ef5f57a2: Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev
* commit '
ef5f57a25d92c7e159e024d0ad9b0c118c467da2':
hwc: always make forward progress in fimd set()
Greg Hackmann [Tue, 9 Oct 2012 15:55:57 +0000 (08:55 -0700)]
Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev
The Android Open Source Project [Tue, 9 Oct 2012 14:31:44 +0000 (07:31 -0700)]
am
6ef93cab: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
6ef93cabf7bf9adcc9274555cf7f4323202b4308':
libgscaler: Fix acquireFenceFd leak with m2m gscalers
The Android Open Source Project [Tue, 9 Oct 2012 14:29:43 +0000 (07:29 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I9deaa80a720da8fddae2d5420a75ec8c6247413a
The Android Automerger [Tue, 9 Oct 2012 13:59:33 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Benoit Goby [Mon, 8 Oct 2012 21:29:35 +0000 (14:29 -0700)]
libgscaler: Fix acquireFenceFd leak with m2m gscalers
After exynos_gsc_m2m_run_core succeeds, the gscaler has a reference on
the acquireFenceFd fences, so they must be closed before returning.
Bug:
7286984
Change-Id: Ie59009e7c6a3e2648e1aa9bb974d8a908788f1e5
Benoit Goby [Mon, 8 Oct 2012 23:23:03 +0000 (16:23 -0700)]
am
27dc3607: am
de5fb8ee: libgscaler: Fix acquireFenceFd leak with m2m gscalers
* commit '
27dc36077f62c47e9739103e0cce029f67828264':
libgscaler: Fix acquireFenceFd leak with m2m gscalers
Alex Ray [Mon, 8 Oct 2012 23:21:42 +0000 (16:21 -0700)]
am
679ae68e: am
e43660b0: libcamera2: Prevent multiple camera open calls
* commit '
679ae68e1b453457c275e02085aad196ef4cfeba':
libcamera2: Prevent multiple camera open calls
Benoit Goby [Mon, 8 Oct 2012 23:04:48 +0000 (16:04 -0700)]
am
de5fb8ee: libgscaler: Fix acquireFenceFd leak with m2m gscalers
* commit '
de5fb8eea5a909f0b85d179d0e7336770c9c6c53':
libgscaler: Fix acquireFenceFd leak with m2m gscalers
Greg Hackmann [Mon, 8 Oct 2012 21:54:45 +0000 (14:54 -0700)]
hwc: always make forward progress in fimd set()
If the FIMD's set() fails for any reason, post a black screen to ensure
forward progress, and try setting the HDMI contents anyway. If the
black screen fails something has gone horribly wrong, so terminate the
runtime.
Bug:
7304464
Change-Id: I6d7333574286e3a87c990c2476c5d987613067d8
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Benoit Goby [Mon, 8 Oct 2012 21:29:35 +0000 (14:29 -0700)]
libgscaler: Fix acquireFenceFd leak with m2m gscalers
After exynos_gsc_m2m_run_core succeeds, the gscaler has a reference on
the acquireFenceFd fences, so they must be closed before returning.
Bug:
7286984
Change-Id: Ie59009e7c6a3e2648e1aa9bb974d8a908788f1e5
Alex Ray [Mon, 8 Oct 2012 21:03:26 +0000 (14:03 -0700)]
am
e43660b0: libcamera2: Prevent multiple camera open calls
* commit '
e43660b0942380839ac881a6af7106c4aace8a29':
libcamera2: Prevent multiple camera open calls
Alex Ray [Mon, 8 Oct 2012 20:20:21 +0000 (13:20 -0700)]
libcamera2: Prevent multiple camera open calls
Requires that previous open camera be closed before a new camera can be
opened.
Bug:
7298182
Change-Id: If128fd5bfa0ce5d6e721351245f220f0530373e8
Igor Murashkin [Mon, 8 Oct 2012 20:39:46 +0000 (13:39 -0700)]
am
58c0059a: am
e2068c92: libcamera2: Clean up scary looking dequeue_request returned NULL log message.
* commit '
58c0059aa8b31b2632bdb03dd75a64e4c054966e':
libcamera2: Clean up scary looking dequeue_request returned NULL log message.
Igor Murashkin [Mon, 8 Oct 2012 20:38:16 +0000 (13:38 -0700)]
am
e2068c92: libcamera2: Clean up scary looking dequeue_request returned NULL log message.
* commit '
e2068c92d6c78d481b5ace3b50ef3e999952a050':
libcamera2: Clean up scary looking dequeue_request returned NULL log message.
Igor Murashkin [Mon, 8 Oct 2012 20:16:07 +0000 (13:16 -0700)]
libcamera2: Clean up scary looking dequeue_request returned NULL log message.
Bug:
7307253
Change-Id: I12e1f18809b98603af54708184f833762b946db4
Greg Hackmann [Mon, 8 Oct 2012 17:57:22 +0000 (10:57 -0700)]
am
af3c8ecb: am
4cc86ec1: gralloc: pad RGB buffers by a minimum of 2 extra lines
* commit '
af3c8ecb63c1cf4f97f4849715ed34a958984c2d':
gralloc: pad RGB buffers by a minimum of 2 extra lines
Greg Hackmann [Mon, 8 Oct 2012 17:47:59 +0000 (10:47 -0700)]
am
4cc86ec1: gralloc: pad RGB buffers by a minimum of 2 extra lines
* commit '
4cc86ec14bdd6f9adf34b1fd7829041a5e4b84a0':
gralloc: pad RGB buffers by a minimum of 2 extra lines
Greg Hackmann [Mon, 8 Oct 2012 17:14:53 +0000 (10:14 -0700)]
gralloc: pad RGB buffers by a minimum of 2 extra lines
If the buffer is xcrop pixels off the left edge of the screen, xcrop
extra pixels are needed past the 1 line of padding normally expected by
the FIMD. xcrop is not known at allocation time so assume the worst
case of a full extra line.
Bug:
7304464
Change-Id: I126992eccfb36a402a202a8236a07a5479332812
Signed-off-by: Greg Hackmann <ghackmann@google.com>
The Android Automerger [Mon, 8 Oct 2012 13:59:24 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Benoit Goby [Mon, 8 Oct 2012 06:25:56 +0000 (23:25 -0700)]
am
93095097: am
3ac75816: Merge "hwc: Use sync fences with m2m gscalers" into jb-mr1-dev
* commit '
930950971d946b2829c6d9e4c57d66255f016c78':
hwc: Use sync fences with m2m gscalers
Benoit Goby [Mon, 8 Oct 2012 06:25:55 +0000 (23:25 -0700)]
am
ee960eb8: am
2badde50: Merge "libgscaler: Add support for sync fences" into jb-mr1-dev
* commit '
ee960eb8690965405d9c884aedabefa7d568961b':
libgscaler: Add support for sync fences
Benoit Goby [Mon, 8 Oct 2012 06:23:01 +0000 (23:23 -0700)]
am
3ac75816: Merge "hwc: Use sync fences with m2m gscalers" into jb-mr1-dev
* commit '
3ac758164b6b49e433191a13160e0918352ca7c8':
hwc: Use sync fences with m2m gscalers
Benoit Goby [Mon, 8 Oct 2012 06:23:00 +0000 (23:23 -0700)]
am
2badde50: Merge "libgscaler: Add support for sync fences" into jb-mr1-dev
* commit '
2badde506768f298b65f103bb369b5ecba97bae0':
libgscaler: Add support for sync fences
Benoit Goby [Mon, 8 Oct 2012 01:31:22 +0000 (18:31 -0700)]
Merge "hwc: Use sync fences with m2m gscalers" into jb-mr1-dev
Benoit Goby [Mon, 8 Oct 2012 01:31:15 +0000 (18:31 -0700)]
Merge "libgscaler: Add support for sync fences" into jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 23:05:21 +0000 (16:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Hyeonmyeong Choi [Sun, 7 Oct 2012 20:12:46 +0000 (13:12 -0700)]
am
408453f6: am
7ef20f42: hardware: samsung_slsi: libcamera2: Enable 3DNR
* commit '
408453f680eb4d8fd1e76d29e72b135525826ad4':
hardware: samsung_slsi: libcamera2: Enable 3DNR
Hyeonmyeong Choi [Sun, 7 Oct 2012 20:11:07 +0000 (13:11 -0700)]
am
7ef20f42: hardware: samsung_slsi: libcamera2: Enable 3DNR
* commit '
7ef20f42c74628187c84332b39f18f272b265c6d':
hardware: samsung_slsi: libcamera2: Enable 3DNR
Hyeonmyeong Choi [Fri, 5 Oct 2012 04:10:21 +0000 (13:10 +0900)]
hardware: samsung_slsi: libcamera2: Enable 3DNR
This patch enable 3DNR for video stabilization.
Bug:
7290340
Change-Id: Ib9ced603c8e65bf517684a01817a3fe6d336f213
Signed-off-by: Hyeonmyeong Choi <hyeon.choi@samsung.com>
The Android Automerger [Sun, 7 Oct 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Benoit Goby [Thu, 4 Oct 2012 23:35:57 +0000 (16:35 -0700)]
hwc: Use sync fences with m2m gscalers
Bug:
7286984
Change-Id: If714474ddb5093d4c2fe0bf35fb15ce612846664
Benoit Goby [Thu, 4 Oct 2012 20:25:29 +0000 (13:25 -0700)]
libgscaler: Add support for sync fences
gsc_m2m_run returns a release fence for both the src and dst images.
The src releaseFenceFd can be returned to userspace as the
releaseFenceFd of the layer and the dst releaseFenceFd can be used as
the acquiredFenceFd for the next pipeline step.
Bug:
7286984
Change-Id: I16bd2828f03fd3eed2c62b23e2325357b1e477e9
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
projects / GitHub / LineageOS / android_hardware_samsung_slsi_exynos5.git / log