GitHub/LineageOS/android_hardware_samsung_slsi_exynos5.git
12 years agoam c6053426: 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

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 agoam 07b3ad1c: hardware: samsung_slsi: libcamera2: increase meta length and remove...
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

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 agoam efd9853a: hwc: reuse gscaler device between frames
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

12 years agoam d6743822: hwc: reserve one gscaler each for FIMD and HDMI
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

12 years agoam 59acf952: Merge "hwc: Fix video layer colors" into jb-mr1-dev
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

12 years agoam 60b9fbf3: Merge "hwc: Add support for video overlay" into jb-mr1-dev
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

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 agoam 6155ddde: Merge "hardware: samsung_slsi: libcamera2: Supports scene mode override...
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

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 agoam c03533ba: 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

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 agoReconcile with jb-mr1-release - do not merge
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

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 agoam cf593314: hardware: samsung_slsi: libcamera2: Fix misplacing JPEG Transport header
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

12 years agoReconcile with jb-mr1-release - do not merge
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

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 agoam 93f9f5db: hwc: Use graphic layer and no gscaler for FB TARGET
Benoit Goby [Tue, 2 Oct 2012 06:33:17 +0000 (23:33 -0700)]
am 93f9f5db: hwc: Use graphic layer and no gscaler for FB TARGET

* commit '93f9f5db1b8ed79cac5abb62544f59c04fd49252':
  hwc: Use graphic layer and no gscaler for FB TARGET

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 agoam 995bbd51: Merge "hardware: samsung_slsi: libcamera2: AE lock bug fix" into jb...
Rebecca Zavin [Mon, 1 Oct 2012 22:44:25 +0000 (15:44 -0700)]
am 995bbd51: Merge "hardware: samsung_slsi: libcamera2: AE lock bug fix" into jb-mr1-dev

* commit '995bbd512ac29912894158067e3fc44d3ceb000a':
  hardware: samsung_slsi: libcamera2: AE lock bug fix

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 agoam 58163f20: Merge "hardware: samsung_slsi: libcamera2: Modify FPS range static metad...
Rebecca Zavin [Mon, 1 Oct 2012 22:39:24 +0000 (15:39 -0700)]
am 58163f20: Merge "hardware: samsung_slsi: libcamera2: Modify FPS range static metadata" into jb-mr1-dev

* commit '58163f20cc1e26ff228cd0ffc00e15182a1c7bab':
  hardware: samsung_slsi: libcamera2: Modify FPS range static metadata

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

* commit '7ccc361c5a191050a4d0be8b608fa2e72e525e63':
  hardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment

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 agoam 2932ace3: Merge "hwc: enforce minimum window width" into jb-mr1-dev
Greg Hackmann [Mon, 1 Oct 2012 21:40:25 +0000 (14:40 -0700)]
am 2932ace3: Merge "hwc: enforce minimum window width" into jb-mr1-dev

* commit '2932ace329799c757b25a8d703b2cfa12ff73bca':
  hwc: enforce minimum window width

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 agoam 6cc676b4: gralloc: change align of stride for EXYNOS_YV12
Seho Kim [Mon, 1 Oct 2012 21:27:50 +0000 (14:27 -0700)]
am 6cc676b4: gralloc: change align of stride for EXYNOS_YV12

* commit '6cc676b447554079d90b048c1b5bcf4130f2f434':
  gralloc: change align of stride for EXYNOS_YV12

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 agoam c06b3290: hardware: samsung_slsi: libcamera2: Use new JPEG transport header in HAL
Sungjoong Kang [Mon, 1 Oct 2012 17:52:00 +0000 (10:52 -0700)]
am c06b3290: hardware: samsung_slsi: libcamera2: Use new JPEG transport header in HAL

* commit 'c06b3290c7fa7d6138cf3b3dcb3280d4eeac5dce':
  hardware: samsung_slsi: libcamera2: Use new JPEG transport header in HAL

12 years agoam 14dce02c: hardware: samsung_slsi: libcamera2: Fix AE state for night mode
Sungjoong Kang [Mon, 1 Oct 2012 17:51:59 +0000 (10:51 -0700)]
am 14dce02c: hardware: samsung_slsi: libcamera2: Fix AE state for night mode

* commit '14dce02c7c8fdc2a9f2a83ed285ea9a79c75089b':
  hardware: samsung_slsi: libcamera2: Fix AE state for night mode

12 years agoam 48728d49: hardware: samsung_slsi: libcamera2: Fix AWB metadata error with ZSL
Sungjoong Kang [Mon, 1 Oct 2012 17:51:58 +0000 (10:51 -0700)]
am 48728d49: hardware: samsung_slsi: libcamera2: Fix AWB metadata error with ZSL

* commit '48728d495b8aa54d3c6cc95229f49f3135107aec':
  hardware: samsung_slsi: libcamera2: Fix AWB metadata error with ZSL

12 years agoam 40acdcc8: hardware: samsung_slsi: libcamera2: AF stalling bug fix
Younghwan Joo [Mon, 1 Oct 2012 17:51:57 +0000 (10:51 -0700)]
am 40acdcc8: hardware: samsung_slsi: libcamera2: AF stalling bug fix

* commit '40acdcc8c7ac1b9c28e4c8ed97598dbfc35a2658':
  hardware: samsung_slsi: libcamera2: AF stalling bug fix

12 years agoam 83bc2903: hardware: samsung_slsi: libcamera2: Supports FPS range metadata
Sungjoong Kang [Mon, 1 Oct 2012 17:51:57 +0000 (10:51 -0700)]
am 83bc2903: hardware: samsung_slsi: libcamera2: Supports FPS range metadata

* commit '83bc29031b8fbc600f8907128e5ea626194ab045':
  hardware: samsung_slsi: libcamera2: Supports FPS range metadata

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 agoam a46f3ffc: hwc: fix gscaler color order for 565 surfaces
Greg Hackmann [Mon, 1 Oct 2012 17:15:55 +0000 (10:15 -0700)]
am a46f3ffc: hwc: fix gscaler color order for 565 surfaces

* commit 'a46f3ffc8589d99c6273ada37c90d6fcf68be70b':
  hwc: fix gscaler color order for 565 surfaces

12 years agoam 644919a6: Merge "hwc: switch HDMI gscaler input to RGBX" into jb-mr1-dev
Greg Hackmann [Mon, 1 Oct 2012 17:14:24 +0000 (10:14 -0700)]
am 644919a6: Merge "hwc: switch HDMI gscaler input to RGBX" into jb-mr1-dev

* commit '644919a60f73c39d49db3d46390362aab9abc86c':
  hwc: switch HDMI gscaler input to RGBX

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 agoam 08ab4d0c: Merge "exynos_omx: Do not call memset on object to be freed" into jb...
Dima Zavin [Fri, 28 Sep 2012 20:47:26 +0000 (13:47 -0700)]
am 08ab4d0c: Merge "exynos_omx: Do not call memset on object to be freed" into jb-mr1-dev

* commit '08ab4d0c6e7aa319b5064ba859a937a1ec654902':
  exynos_omx: Do not call memset on object to be freed

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 agoam 6b236ec0: Merge "hwc: reduce blank ioctl EBUSY from error to info" into jb-mr1-dev
Greg Hackmann [Fri, 28 Sep 2012 17:59:11 +0000 (10:59 -0700)]
am 6b236ec0: Merge "hwc: reduce blank ioctl EBUSY from error to info" into jb-mr1-dev

* commit '6b236ec0c0aa68afa4692146a4b0e80f21d9767e':
  hwc: reduce blank ioctl EBUSY from error to info

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 agoam 405cc122: mobicore: remove useless kernel header
Dima Zavin [Fri, 28 Sep 2012 17:36:29 +0000 (10:36 -0700)]
am 405cc122: mobicore: remove useless kernel header

* commit '405cc12255d59427f17ebc017daf9af589e2640e':
  mobicore: remove useless kernel header

12 years agoam 7b143edf: exynos: mobicore: update Mobicore userspace daemon and libraries
Jungtae Kim [Fri, 28 Sep 2012 17:36:29 +0000 (10:36 -0700)]
am 7b143edf: exynos: mobicore: update Mobicore userspace daemon and libraries

* commit '7b143edf281bed18c8ebd0733465f3af5af327eb':
  exynos: mobicore: update Mobicore userspace daemon and libraries

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 agoam 39433170: Revert "Double the memory in any blob allocations"
Rebecca Schultz Zavin [Fri, 28 Sep 2012 03:51:27 +0000 (20:51 -0700)]
am 39433170: Revert "Double the memory in any blob allocations"

* commit '39433170a04f1f9c307d29e3bb2d7d5e11bf7824':
  Revert "Double the memory in any blob allocations"

12 years agoam 3c006f81: hardware: samsung_slsi: libcamera2: Temp increase of jpeg max size
Sungjoong Kang [Thu, 27 Sep 2012 23:45:15 +0000 (16:45 -0700)]
am 3c006f81: hardware: samsung_slsi: libcamera2: Temp increase of jpeg max size

* commit '3c006f81491a876ab9ea48a6479592ea85c5059e':
  hardware: samsung_slsi: libcamera2: Temp increase of jpeg max size

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 agoam f0708d21: hardware: samsung_slsi: libcamera2: Modify stream release condition
Sungjoong Kang [Thu, 27 Sep 2012 23:34:42 +0000 (16:34 -0700)]
am f0708d21: hardware: samsung_slsi: libcamera2: Modify stream release condition

* commit 'f0708d21f0cbadbc03f3f940c5e9a03d8dc29bb8':
  hardware: samsung_slsi: libcamera2: Modify stream release condition

12 years agoam bf96172c: hardware: samsung_slsi: libcamera2: ion_map buffers for required case...
Sungjoong Kang [Thu, 27 Sep 2012 23:34:42 +0000 (16:34 -0700)]
am bf96172c: hardware: samsung_slsi: libcamera2: ion_map buffers for required case only

* commit 'bf96172c9e9a71d1c48e619869579002cbbc2268':
  hardware: samsung_slsi: libcamera2: ion_map buffers for required case only

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 agoam 1952fb31: Merge "hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP...
Rebecca Zavin [Thu, 27 Sep 2012 22:41:47 +0000 (15:41 -0700)]
am 1952fb31: Merge "hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP" into jb-mr1-dev

* commit '1952fb312e3202e475e81700b452273a74e819d4':
  hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP

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 agoam 2a19eb16: hwc: enforce X-coordinate alignment constraints
Greg Hackmann [Thu, 27 Sep 2012 22:19:26 +0000 (15:19 -0700)]
am 2a19eb16: hwc: enforce X-coordinate alignment constraints

* commit '2a19eb169927b5669b2bc0adb96145b84ae49c6b':
  hwc: enforce X-coordinate alignment constraints

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 agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 27 Sep 2012 16:58:25 +0000 (09:58 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I033900565b24e63e166a836229ffd021e3b4e682

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 agoam 46bbff71: Merge "clean kernel headers" into jb-mr1-dev
Greg Hackmann [Thu, 27 Sep 2012 00:32:27 +0000 (17:32 -0700)]
am 46bbff71: Merge "clean kernel headers" into jb-mr1-dev

* commit '46bbff719a64d7fef89e702b0d86164bcae0ee37':
  clean kernel headers

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 agoam 9eb2a020: hwc: support HAL_PIXEL_FORMAT_BGRA_8888
Greg Hackmann [Wed, 26 Sep 2012 23:48:00 +0000 (16:48 -0700)]
am 9eb2a020: hwc: support HAL_PIXEL_FORMAT_BGRA_8888

* commit '9eb2a0209e821f702227c61ccf7dd18aca2a6d82':
  hwc: support HAL_PIXEL_FORMAT_BGRA_8888

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 agoam 105be0b2: hwc: Return a release fence for the FRAMEBUFFER_TARGET layer
Benoit Goby [Wed, 26 Sep 2012 22:18:43 +0000 (15:18 -0700)]
am 105be0b2: hwc: Return a release fence for the FRAMEBUFFER_TARGET layer

* commit '105be0b2aac13c94567036612a9556aae34c1590':
  hwc: Return a release fence for the FRAMEBUFFER_TARGET layer