GitHub/LineageOS/android_hardware_samsung_slsi_exynos5.git
12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agohardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)
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>
12 years agohardware: samsung_slsi: libcamera2: Supports AE region
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>
12 years agohardware: samsung_slsi: libcamera2: Fix CAF to AF transition error
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>
12 years agohardware: samsung_slsi: libcamera2: Support JPEG quality
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>
12 years agohardware: samsung_slsi: libcamera2: Fix screen blinking on start
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>
12 years agohardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates
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>
12 years agoMerge "hardware: samsung_slsi: libcamera2: Correct front and rear camera info" into...
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

12 years agohardware: samsung_slsi: libcamera2: Correct front and rear camera info
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>
12 years agohardware: 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>
12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agohwc: 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>
12 years agoFix 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>
12 years agoMerge changes I28fc9f33,I7594e39e,I831e4839 into jb-mr1-dev
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

12 years agohwc: keep gscaler streaming on between frames
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>
12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agohardware: samsung_slsi: libcamera2: Change FD filtering method
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>
12 years agohardware: samsung_slsi: libcamera2: make sync between pre and main flash
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>
12 years agohardware: samsung_slsi: libcamera2: Fixed crop region mismatch
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>
12 years agohardware: samsung_slsi: libcamera2: VDIS disable bug fix
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>
12 years agohardware: samsung_slsi: libcamera2: Protection from re-releasing stream
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>
12 years agohardware: samsung_slsi: libcamera2: Fix missing fields in EXIF
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>
12 years agohardware: samsung_slsi: libcamera2: Fix black frame after night shot
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>
12 years agoMerge "Don't map gralloc buffers when you allocate them" into jb-mr1-dev
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

12 years agohardware: 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>
12 years agoDon't map gralloc buffers when you allocate them
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>
12 years agolibgscaler: don't reconfigure m2m gscaler every frame
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>
12 years agolibgscaler: split stop operation into discrete wait and stop operations
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>
12 years agohardware: 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>
12 years agohwc: Fix video layer colors
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

12 years agohwc: Add support for video overlay
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

12 years agohardware: 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>
12 years agohwc: reuse gscaler device between frames
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>
12 years agohwc: reserve one gscaler each for FIMD and HDMI
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>
12 years agoMerge "hwc: Fix video layer colors" into jb-mr1-dev
Benoit Goby [Wed, 3 Oct 2012 19:21:23 +0000 (12:21 -0700)]
Merge "hwc: Fix video layer colors" into jb-mr1-dev

12 years agoMerge "hwc: Add support for video overlay" 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

12 years agoMerge "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

12 years agohardware: samsung_slsi: libcamera2: Supports scene mode override and quirks
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>
12 years agoclean kernel headers
Simon Wilson [Wed, 3 Oct 2012 16:52:14 +0000 (09:52 -0700)]
clean kernel headers

Bug: 7233428
Change-Id: Ib1ea24fbcea64562abc6e22b23a7d77cad2c1fe7

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agohwc: Fix video layer colors
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

12 years agohwc: Add support for video overlay
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

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agohardware: samsung_slsi: libcamera2: Fix misplacing JPEG Transport header
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>
12 years agohwc: Use graphic layer and no gscaler for FB TARGET
Benoit Goby [Sat, 29 Sep 2012 03:37:17 +0000 (20:37 -0700)]
hwc: Use graphic layer and no gscaler for FB TARGET

Bug: 7123196
Change-Id: I8fffd9c6896919b2d24192e90d5125d0976980d3

12 years agoMerge "hardware: samsung_slsi: libcamera2: AE lock bug fix" into jb-mr1-dev
Rebecca Zavin [Mon, 1 Oct 2012 22:40:41 +0000 (15:40 -0700)]
Merge "hardware: samsung_slsi: libcamera2: AE lock bug fix" into jb-mr1-dev

12 years agoMerge "hardware: samsung_slsi: libcamera2: Modify FPS range static metadata" into...
Rebecca Zavin [Mon, 1 Oct 2012 22:35:50 +0000 (15:35 -0700)]
Merge "hardware: samsung_slsi: libcamera2: Modify FPS range static metadata" into jb-mr1-dev

12 years agoMerge "hardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment" into jb-mr1-dev
Rebecca Zavin [Mon, 1 Oct 2012 22:35:39 +0000 (15:35 -0700)]
Merge "hardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment" into jb-mr1-dev

12 years agoMerge "hwc: enforce minimum window width" into jb-mr1-dev
Greg Hackmann [Mon, 1 Oct 2012 21:36:26 +0000 (14:36 -0700)]
Merge "hwc: enforce minimum window width" into jb-mr1-dev

12 years agohardware: samsung_slsi: libcamera2: AE lock bug fix
Hyeonmyeong Choi [Sat, 29 Sep 2012 08:38:37 +0000 (17:38 +0900)]
hardware: samsung_slsi: libcamera2: AE lock bug fix

This patch fix the bug that AE mode is locked after capture.
And fix exposure compensation bug that wrong enumeration.

Bug: 7251985
Change-Id: Idfea6abb194c2bc692a38d0303bef9c9d73c4cea
Signed-off-by: Hyeonmyeong Choi <hyeon.choi@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: Modify FPS range static metadata
Sungjoong Kang [Mon, 1 Oct 2012 20:01:11 +0000 (13:01 -0700)]
hardware: samsung_slsi: libcamera2: Modify FPS range static metadata

This patch corrects supported FPS range.

Bug: 7259959
Change-Id: I29d9811b356128d7d47e86a0c5bfdde7fc6ad63d
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment
Sungjoong Kang [Sat, 29 Sep 2012 03:07:32 +0000 (20:07 -0700)]
hardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment

This patch fixes UV plane misalignment of YV12 format
for the resolutions of which width is not multiple of 32.

BUG: 7225357
Change-Id: I1faa7fbc4d9781466f3e8c8b502e33942c52a746
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agogralloc: change align of stride for EXYNOS_YV12
Seho Kim [Sun, 30 Sep 2012 20:35:01 +0000 (13:35 -0700)]
gralloc: change align of stride for EXYNOS_YV12

alignment of stride for EXNOS_YV12 is changed to 32.

Bug: 7225357
Change-Id: I6ed66ecba77fde6ad22cd366766bd79d7e1d2b50
Signed-off-by: Seho Kim <sh1645.kim@samsung.com>
12 years agohwc: enforce minimum window width
Greg Hackmann [Mon, 1 Oct 2012 20:31:26 +0000 (13:31 -0700)]
hwc: enforce minimum window width

Windows narrower than the FIMD's DMA burst length (128 bytes) are
rejected by the kernel because they may wedge the FIMD.

Bug: 7257993
Change-Id: I145db16940bd972e4197a0851bfc992ad4ecdf45
Signed-off-by: Greg Hackmann <ghackmann@google.com>
12 years agohardware: samsung_slsi: libcamera2: Use new JPEG transport header in HAL
Sungjoong Kang [Sat, 29 Sep 2012 00:14:57 +0000 (17:14 -0700)]
hardware: samsung_slsi: libcamera2: Use new JPEG transport header in HAL

HAL sends the actual size of JPEG data by using new jpeg blob structure.
(size will be placed at the end of buffer)

Bug: 7108816
Change-Id: I80b93ed843eabea16656d5677a109979682fba04
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: Fix AE state for night mode
Sungjoong Kang [Sat, 29 Sep 2012 10:32:04 +0000 (03:32 -0700)]
hardware: samsung_slsi: libcamera2: Fix AE state for night mode

Makes AE state to be passed to camera service properly
so that service can decide capture method between ZSL and normal.

Bug: 7257412
Change-Id: I58e8b69a9e444cdc6a69de73075fe67e85ddaa08
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: Fix AWB metadata error with ZSL
Sungjoong Kang [Wed, 26 Sep 2012 20:48:48 +0000 (13:48 -0700)]
hardware: samsung_slsi: libcamera2: Fix AWB metadata error with ZSL

This patch fixes AWB metadata error that causes
stillshot with invaild AWB setting in case of rapid shot.

Bug: 7239330
Change-Id: Ibaa9e4278ea158a0f26a299ad566f3aa045ed108
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: AF stalling bug fix
Younghwan Joo [Sat, 29 Sep 2012 07:32:43 +0000 (16:32 +0900)]
hardware: samsung_slsi: libcamera2: AF stalling bug fix

This patch is to fix a bug that capture operation is impossible
to af stalled.

Bug: 7256969
Change-Id: I156914321137a7f66df4184d64cb6364dfe27a48
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: Supports FPS range metadata
Sungjoong Kang [Sat, 29 Sep 2012 07:21:47 +0000 (00:21 -0700)]
hardware: samsung_slsi: libcamera2: Supports FPS range metadata

This patch enables the processing of min/max FPS metadata.

Bug: 7249364
Change-Id: I27b87ef05d482a37ccf71e87f4d726dfecc4f74f
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 1 Oct 2012 01:17:47 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

12 years agohwc: fix gscaler color order for 565 surfaces
Greg Hackmann [Sun, 30 Sep 2012 20:43:09 +0000 (13:43 -0700)]
hwc: fix gscaler color order for 565 surfaces

Bug: 7257843
Change-Id: I8847cbd49d384238483c1494a1a777d8aef4cff0
Signed-off-by: Greg Hackmann <ghackmann@google.com>
12 years agoMerge "hwc: switch HDMI gscaler input to RGBX" into jb-mr1-dev
Greg Hackmann [Sun, 30 Sep 2012 16:17:01 +0000 (09:17 -0700)]
Merge "hwc: switch HDMI gscaler input to RGBX" into jb-mr1-dev

12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 30 Sep 2012 13:59:47 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

12 years agomobicore: remove useless kernel header
Dima Zavin [Wed, 26 Sep 2012 21:16:37 +0000 (14:16 -0700)]
mobicore: remove useless kernel header

Change-Id: I99713461f5211b3322eb0cdb86bc50f9537714a8
Signed-off-by: Dima Zavin <dima@android.com>
12 years agoexynos: mobicore: update Mobicore userspace daemon and libraries
Jungtae Kim [Fri, 21 Sep 2012 14:23:57 +0000 (23:23 +0900)]
exynos: mobicore: update Mobicore userspace daemon and libraries

Mobicore is updated to MC1.2_V005 from MC1.2_V003
In addition, it fixed Mobicore Startup fail problem.

Change-Id: Iee6e975c043cecc63d3fa95aaee3fc8ff2522ba7
Signed-off-by: Jungtae Kim <jt1217.kim@samsung.com>
12 years agoMerge "exynos_omx: Do not call memset on object to be freed" into jb-mr1-dev
Dima Zavin [Fri, 28 Sep 2012 20:46:05 +0000 (13:46 -0700)]
Merge "exynos_omx: Do not call memset on object to be freed" into jb-mr1-dev

12 years agohwc: switch HDMI gscaler input to RGBX
Greg Hackmann [Fri, 28 Sep 2012 20:19:46 +0000 (13:19 -0700)]
hwc: switch HDMI gscaler input to RGBX

Framebuffer format has changed to match mixer's RGB order

Bug: 7229550
Change-Id: Ibb8e9201f0b906ceb06e9fe1fe59e44d0e6e8724
Signed-off-by: Greg Hackmann <ghackmann@google.com>
12 years agoexynos_omx: Do not call memset on object to be freed
SeungBeom Kim [Thu, 27 Sep 2012 19:40:28 +0000 (12:40 -0700)]
exynos_omx: Do not call memset on object to be freed

pointer could be null, in which case free would succeed
but we first called memset() and things exploded.

Fixes a crash when video editor test attempts to export video
with multiple transitions.

Bug: 7233929
Change-Id: Iac752effe2c239b218cfe3c7d46d1b0ad19b7080
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
12 years agoMerge "hwc: reduce blank ioctl EBUSY from error to info" into jb-mr1-dev
Greg Hackmann [Fri, 28 Sep 2012 17:57:22 +0000 (10:57 -0700)]
Merge "hwc: reduce blank ioctl EBUSY from error to info" into jb-mr1-dev

12 years agohwc: reduce blank ioctl EBUSY from error to info
Greg Hackmann [Fri, 28 Sep 2012 17:28:51 +0000 (10:28 -0700)]
hwc: reduce blank ioctl EBUSY from error to info

EBUSY means the screen is already in the requested state.  This happens
during normal initialization and isn't harmful in practice.

Bug: 7249087
Change-Id: Ic8b6078aadd48d776191523e9696455d68b6ac62
Signed-off-by: Greg Hackmann <ghackmann@google.com>
12 years agomobicore: remove useless kernel header
Dima Zavin [Wed, 26 Sep 2012 21:16:37 +0000 (14:16 -0700)]
mobicore: remove useless kernel header

Change-Id: I99713461f5211b3322eb0cdb86bc50f9537714a8
Signed-off-by: Dima Zavin <dima@android.com>
12 years agoexynos: mobicore: update Mobicore userspace daemon and libraries
Jungtae Kim [Fri, 21 Sep 2012 14:23:57 +0000 (23:23 +0900)]
exynos: mobicore: update Mobicore userspace daemon and libraries

Mobicore is updated to MC1.2_V005 from MC1.2_V003
In addition, it fixed Mobicore Startup fail problem.

Change-Id: Iee6e975c043cecc63d3fa95aaee3fc8ff2522ba7
Signed-off-by: Jungtae Kim <jt1217.kim@samsung.com>
12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 28 Sep 2012 13:59:35 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

12 years agoRevert "Double the memory in any blob allocations"
Rebecca Schultz Zavin [Thu, 27 Sep 2012 23:45:04 +0000 (16:45 -0700)]
Revert "Double the memory in any blob allocations"

This reverts commit 53efd24f292043771988c4715225a2bca32ad2a8.

12 years agohardware: samsung_slsi: libcamera2: Temp increase of jpeg max size
Sungjoong Kang [Thu, 27 Sep 2012 23:02:40 +0000 (16:02 -0700)]
hardware: samsung_slsi: libcamera2: Temp increase of jpeg max size

Before determining actual maximum size of jpeg image,
temporarily increased ANDROID_JPEG_MAX_SIZE to 10MB
so that still capture can be done without gralloc HACK for blob.

Bug: 7234975
Change-Id: I98093fa07068d4a4aa55dda8030558fa81385405
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: Modify stream release condition
Sungjoong Kang [Wed, 26 Sep 2012 20:31:46 +0000 (13:31 -0700)]
hardware: samsung_slsi: libcamera2: Modify stream release condition

This patch fixes preview stuck on 2nd recording after changing
record resolution.

Bug: 7239183
Change-Id: Ic6a852725dcb52a713664f13a4f0d869a99519d1
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: ion_map buffers for required case only
Sungjoong Kang [Thu, 27 Sep 2012 22:40:59 +0000 (15:40 -0700)]
hardware: samsung_slsi: libcamera2: ion_map buffers for required case only

For the buffers which don't require to be handled with address,
don't ion_map them.

Bug: 7208003
Change-Id: Ibcbe29792a57065abd4fd8d266edb1faf077868d
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agoMerge "hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP" into jb-mr1-dev
Rebecca Zavin [Thu, 27 Sep 2012 22:40:05 +0000 (15:40 -0700)]
Merge "hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP" into jb-mr1-dev

12 years agohardware: samsung_slsi: libcamera2: Enqueue every frame to ISP
Sungjoong Kang [Wed, 26 Sep 2012 21:04:23 +0000 (14:04 -0700)]
hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP

Even during shot-to-shot delay, enqueue all the frames
to the ISP for 3A operation.

Bug: 7239574
Change-Id: I995aee96b6aca10ceee8c9027f582526e1507d1f
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohwc: enforce X-coordinate alignment constraints
Greg Hackmann [Thu, 27 Sep 2012 21:09:18 +0000 (14:09 -0700)]
hwc: enforce X-coordinate alignment constraints

The FIMD requires buffers' X coordinates to be aligned to word
boundaries.  Use a Gscaler to convert unaligned buffers to 32-bpp, which
have no alignment constraints (1 word == 1 pixel).

Bug: 7242154
Change-Id: I169f89d3eaff4d7694a1e7fc4696caaf4bbd512d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 27 Sep 2012 13:59:55 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

12 years agohardware: samsung_slsi: libcamera2: Fix capture aspect ratio bug
Sungjoong Kang [Mon, 24 Sep 2012 01:57:37 +0000 (18:57 -0700)]
hardware: samsung_slsi: libcamera2: Fix capture aspect ratio bug

When preview aspect ratio is wider than capture,
center of image will be used for capture.

Bug: 7191491

Change-Id: I970f5995993e716bc02a6306609d7570a71829b6
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: Change ISP streamoff sequence
Sungjoong Kang [Mon, 24 Sep 2012 08:48:33 +0000 (01:48 -0700)]
hardware: samsung_slsi: libcamera2: Change ISP streamoff sequence

To prevent memory-related crash, modified streamoff sequence.
After applying this patch, ISP streamoff will be called before
scaler streamoff.

Change-Id: I2cf7120a0bebb2341d07b256c42c975649f473f3
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: update meta data region
Younghwan Joo [Fri, 21 Sep 2012 00:52:19 +0000 (17:52 -0700)]
hardware: samsung_slsi: libcamera2: update meta data region

This is to update meta data, synchnonized data region between
cameraHAL and driver

Change-Id: I2118dee22e01138675a0f8058096810d218b7f79
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: Fix frame completion scheme
Sungjoong Kang [Tue, 25 Sep 2012 08:39:19 +0000 (01:39 -0700)]
hardware: samsung_slsi: libcamera2: Fix frame completion scheme

Modified RequestMgr to preserve the order of frame completion
so that request queue acts always FIFO.

Change-Id: Ib6082faa77661200b602ade7019e4ecd4ac81180
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: Preserve SCC info on res change.
Sungjoong Kang [Mon, 24 Sep 2012 20:46:10 +0000 (13:46 -0700)]
hardware: samsung_slsi: libcamera2: Preserve SCC info on res change.

Preserve ScalerC buffer information on preview stream size change
for the consistency with camera service.

Change-Id: Iad063164598191bcf4c7e26266e2e1f26679560e
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: change min fd score value for meta data
Younghwan Joo [Tue, 25 Sep 2012 13:01:10 +0000 (22:01 +0900)]
hardware: samsung_slsi: libcamera2: change min fd score value for meta data

This patch is to change min fd score value to decide upload fd meta data
to camera service or not

Change-Id: If454186d982e265c5f82dc34f96c551cec9bb6db
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: support face priority scene mode
Younghwan Joo [Tue, 25 Sep 2012 12:12:30 +0000 (21:12 +0900)]
hardware: samsung_slsi: libcamera2: support face priority scene mode

This patch is to support AF with face result at face priority scene
mode. This feature is required camera fimware which version is #2645
or above.

Change-Id: If189904f88be0737a011f32e9831b457f6f77261
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: support flash off mode with ZSL
Younghwan Joo [Sat, 22 Sep 2012 08:15:20 +0000 (01:15 -0700)]
hardware: samsung_slsi: libcamera2: support flash off mode with ZSL

This commit is to change aeState at flash off mode.
At FIMC-ISP, between ZSL capture and standard capture is
the same as the image quality

Change-Id: I261e454e9430ffd066d116961bd2c169a45121dd
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
12 years agoMerge "clean kernel headers" into jb-mr1-dev
Greg Hackmann [Thu, 27 Sep 2012 00:30:02 +0000 (17:30 -0700)]
Merge "clean kernel headers" into jb-mr1-dev

12 years agohwc: support HAL_PIXEL_FORMAT_BGRA_8888
Greg Hackmann [Wed, 26 Sep 2012 16:37:12 +0000 (09:37 -0700)]
hwc: support HAL_PIXEL_FORMAT_BGRA_8888

Bug: 7229550
Change-Id: Idec29ccb8b84af52e7c4e7af613bfdde6a6cb011
Signed-off-by: Greg Hackmann <ghackmann@google.com>
12 years agoclean kernel headers
Greg Hackmann [Wed, 26 Sep 2012 21:05:35 +0000 (14:05 -0700)]
clean kernel headers

Change-Id: I51c0119e9c743e21f571a743327fe299496ece81
Signed-off-by: Greg Hackmann <ghackmann@google.com>
12 years agohwc: Return a release fence for the FRAMEBUFFER_TARGET layer
Benoit Goby [Fri, 21 Sep 2012 20:19:30 +0000 (13:19 -0700)]
hwc: Return a release fence for the FRAMEBUFFER_TARGET layer

Bug: 7123196
Change-Id: I2236b187dc6fa8e8504c667797bc73efe596dc05

12 years agoMerge "libgscaler: Add support for sync" into jb-mr1-dev
Benoit Goby [Wed, 26 Sep 2012 22:15:02 +0000 (15:15 -0700)]
Merge "libgscaler: Add support for sync" into jb-mr1-dev

12 years agohardware: samsung_slsi: libcamera2: bug fix of single AF
Younghwan Joo [Wed, 26 Sep 2012 13:51:10 +0000 (22:51 +0900)]
hardware: samsung_slsi: libcamera2: bug fix of single AF

This patch is to fix a bug of single AF in case of successive capturing

Change-Id: I437c128c88b76680a49b89aa98c8cc1ca696b35e
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: modify CAF sequence for flash
Younghwan Joo [Fri, 21 Sep 2012 07:42:08 +0000 (00:42 -0700)]
hardware: samsung_slsi: libcamera2: modify CAF sequence for flash

This patch is to modify CAF sequence for proper operation
with flash

Change-Id: I0118463e7d8dc1d60c335d1ddf08f94fb1347cd7
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
12 years agohwc: enable gscaler on RGBX surfaces
Greg Hackmann [Thu, 20 Sep 2012 16:35:37 +0000 (09:35 -0700)]
hwc: enable gscaler on RGBX surfaces

Bug: 6979023
Change-Id: I3df195443d547f3cd3d36089925dc5c9a135e261
Signed-off-by: Greg Hackmann <ghackmann@google.com>
12 years agolibgscaler: Add support for sync
Benoit Goby [Thu, 6 Sep 2012 03:12:03 +0000 (20:12 -0700)]
libgscaler: Add support for sync

Changed gsc_out_run to return the fence returned by qbuf and to
dequeue a buffer only when all buffers have been enqueued.
Start streaming after one buffer has been enqueued.

Bug: 7123196
Change-Id: Ib2a563b9d39888d66f0d4a37c79fde2f7b7140fa

12 years agohwc: Remove force_fb flag, there's always content for HDMI
Benoit Goby [Sat, 22 Sep 2012 00:16:45 +0000 (17:16 -0700)]
hwc: Remove force_fb flag, there's always content for HDMI

Bug: 7123196
Change-Id: Id0327b5fd7d3a7777c2dc13a99e51d5b11864388

12 years agohwc: Ignore content for HDMI when it is not enabled
Benoit Goby [Sat, 22 Sep 2012 00:12:28 +0000 (17:12 -0700)]
hwc: Ignore content for HDMI when it is not enabled

Bug: 7231798
Change-Id: I82d4baa3c1b84c2f16e6b633f4e1457730333124