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: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: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: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: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: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: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: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: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: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: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: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 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: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: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: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: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
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: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: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 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: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: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: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
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
Sungjoong Kang [Tue, 2 Oct 2012 17:53:17 +0000 (10:53 -0700)]
am
cf593314: hardware: samsung_slsi: libcamera2: Fix misplacing JPEG Transport header
* commit '
cf59331416573a0c9c1f2b925b7531e1e635b322':
hardware: samsung_slsi: libcamera2: Fix misplacing JPEG Transport header
The Android Open Source Project [Tue, 2 Oct 2012 16:19:05 +0000 (09:19 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I0d505138d8787065c448c5d3d5523a21329c6e90
The Android Automerger [Tue, 2 Oct 2012 13:59:49 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sungjoong Kang [Tue, 2 Oct 2012 06:47:22 +0000 (23:47 -0700)]
hardware: samsung_slsi: libcamera2: Fix misplacing JPEG Transport header
Fix the case that JPEG transport header is placed to
incorrect position.
BUG:
7268311
Change-Id: I7e49cd957f74addf04c84a9fe6f18c7926a12f82
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
projects / GitHub / LineageOS / android_hardware_samsung_slsi_exynos5.git / log