Younghwan Joo [Tue, 23 Oct 2012 23:22:15 +0000 (16:22 -0700)]
am
a0648fc7: hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
* commit '
a0648fc71e705cf211caa991639e2a559e1498d9':
hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
Younghwan Joo [Tue, 23 Oct 2012 23:22:04 +0000 (16:22 -0700)]
am
6a87e47a: hardware: samsung_slsi: libcamera2: clipping fd score to the max score
* commit '
6a87e47a1b93226f778d859a37b0e4655785a4a8':
hardware: samsung_slsi: libcamera2: clipping fd score to the max score
Younghwan Joo [Tue, 23 Oct 2012 09:49:50 +0000 (18:49 +0900)]
hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
This patch is to change aeMode in case of video snapshot to disable flash
sequence even received capture intent is not video snapshot but still capture.
A UI mode value of flash is updated only at preview and recording status.
BUG :
7396371
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
Change-Id: I4ce5a2b67c4590de9f896573c37387701afcd202
Younghwan Joo [Thu, 18 Oct 2012 06:21:19 +0000 (15:21 +0900)]
hardware: samsung_slsi: libcamera2: clipping fd score to the max score
This patch is to clip fd score if the score is over the android max fd score
(100). If a fd score exceeds to 100, that value is fixed to 100.
BUG :
7368020
Signed-off-by: Younghwan Joo <yhwan.joo@samsung.com>
Change-Id: Ieae601cce47d79bcf79bc6e2d80a9ab24a1bb937
Sungjoong Kang [Mon, 22 Oct 2012 23:53:17 +0000 (16:53 -0700)]
am
3c17a3f7: hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
* commit '
3c17a3f79068fef751c777a7c13830d23e5f51cf':
hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
Sungjoong Kang [Mon, 22 Oct 2012 21:39:49 +0000 (14:39 -0700)]
hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
Add support for 24 and 25 fps modes.
Fix bug on applying maximum fps parameter.
BUG :
7385305
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Change-Id: I005f87da69ca12d408b51d46f1fbd75d1a1a6cc5
Greg Hackmann [Fri, 19 Oct 2012 04:05:06 +0000 (21:05 -0700)]
am
92b0aadb: hwc: adjust protected content scaling for gscaler width constraints
* commit '
92b0aadb2237196ee193c6500c6f864c8497c97a':
hwc: adjust protected content scaling for gscaler width constraints
Greg Hackmann [Thu, 18 Oct 2012 17:37:59 +0000 (10:37 -0700)]
hwc: adjust protected content scaling for gscaler width constraints
Protected content cannot be sent through the GPU. Instead slightly
over-scale to meet the Gscaler's 32-pixel alignment constraint and crop
back to the requested display frame.
Also move the minimum-width check to prevent a potential divide-by-zero
in the padding calculations.
Bug:
7365351
Change-Id: Ia0807fe6c4a6c25364fe08ed1f2eb223f3cb0d4e
Signed-off-by: Greg Hackmann <ghackmann@google.com>
James Dong [Thu, 18 Oct 2012 03:19:41 +0000 (20:19 -0700)]
am
d08bf0b2: Merge "Added error handling in the state change from "Load state" to "Idle state"." into jb-mr1-dev
* commit '
d08bf0b27662d58d1768123dc5e370322fc0308a':
Added error handling in the state change from "Load state" to "Idle state".
James Dong [Thu, 18 Oct 2012 03:16:05 +0000 (20:16 -0700)]
Merge "Added error handling in the state change from "Load state" to "Idle state"." into jb-mr1-dev
Sungjoong Kang [Thu, 18 Oct 2012 00:42:58 +0000 (17:42 -0700)]
am
0757ed8e: hardware: samsung_slsi: libcamera2: Add 15fps mode support
* commit '
0757ed8e7902eff0f8ef114ac97fb4a732243c1c':
hardware: samsung_slsi: libcamera2: Add 15fps mode support
Sungjoong Kang [Wed, 17 Oct 2012 23:52:31 +0000 (16:52 -0700)]
hardware: samsung_slsi: libcamera2: Add 15fps mode support
Added 15 fps mode for camera HAL.
BUG:
6970986
Change-Id: I86ca5ec0dd7c714c66fc2fd6d3327ecbac1ca42c
7368321
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
James Dong [Wed, 17 Oct 2012 23:38:41 +0000 (16:38 -0700)]
am
2f9c21c5: Merge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode" into jb-mr1-dev
* commit '
2f9c21c521cf8b1bc242ad365fc0e3fe31be5979':
hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode
James Dong [Wed, 17 Oct 2012 23:34:55 +0000 (16:34 -0700)]
Merge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode" into jb-mr1-dev
SeungBeom Kim [Fri, 5 Oct 2012 04:59:28 +0000 (21:59 -0700)]
Added error handling in the state change from "Load state" to "Idle state".
This patch fixes the ANR at reset/release time, caused by some failures in initilizating video decoders
Bug:
7282066
Change-Id: Ic8440ff597dc4a3a6fa568c141c28e00dda518d1
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Signed-off-by: Yunji Kim <yunji.kim@samsung.com>
DongJin Park [Wed, 17 Oct 2012 06:47:01 +0000 (23:47 -0700)]
am
2821a826: mobicore: update daemon to handle MobiCore halt status
* commit '
2821a826dbd3097b27801e02a2d7bc412a02e76c':
mobicore: update daemon to handle MobiCore halt status
DongJin Park [Tue, 16 Oct 2012 03:59:55 +0000 (12:59 +0900)]
mobicore: update daemon to handle MobiCore halt status
Daemon asks correct status from MobiCore: FC_INFO state_id = 1
(Update from MobiCore1.2_V005_Path3)
Bug:
7179227,
7336639
Change-Id: I87dc8acc3fd7e56a6a0dd2c9be0c8a5b995e6c87
Signed-off-by: DongJin Park <djpax.park@samsung.com>
Sungjoong Kang [Wed, 17 Oct 2012 00:42:38 +0000 (17:42 -0700)]
hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode
Removed codes for force-setting 30 FPS for recording mode.
BUG :
6970986
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Change-Id: Ife4cce05de3149761b18adf28139166807c4b3c4
Greg Hackmann [Tue, 16 Oct 2012 23:05:56 +0000 (16:05 -0700)]
am
5d99ec51: hwc: set Gscaler to narrow RGB for YUV surfaces
* commit '
5d99ec51e355e21a6c31c9a071f9eaf495a5acda':
hwc: set Gscaler to narrow RGB for YUV surfaces
Greg Hackmann [Tue, 16 Oct 2012 23:05:55 +0000 (16:05 -0700)]
am
bcd3f11d: libgscaler: add csc range field
* commit '
bcd3f11d136665f5f508aa802d27e9f4ed888b4e':
libgscaler: add csc range field
Greg Hackmann [Thu, 11 Oct 2012 21:26:13 +0000 (14:26 -0700)]
hwc: set Gscaler to narrow RGB for YUV surfaces
Bug:
7310985
Change-Id: I469c1de7503f53e6d8a4fecd224982547e5b9021
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Thu, 11 Oct 2012 21:22:43 +0000 (14:22 -0700)]
libgscaler: add csc range field
Defaults to wide RGB; can be changed by setting narrowRgb field in
destination buffer configuration
Bug:
7310985
Change-Id: I7b5a4da4eeac5d82396cabb707e8651f785f039b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
SeungBeom Kim [Tue, 16 Oct 2012 04:06:23 +0000 (21:06 -0700)]
am
af4568d1: OMX encode component has problem on "idle->execute->idle state change" without input data. This patch fixes the state change (Execute to Idle) bug.
* commit '
af4568d16d0afed7604e9496ad42e2fcf1e44fde':
OMX encode component has problem on "idle->execute->idle state change" without input data. This patch fixes the state change (Execute to Idle) bug.
SeungBeom Kim [Fri, 12 Oct 2012 19:36:12 +0000 (12:36 -0700)]
OMX encode component has problem on "idle->execute->idle state change" without input data.
This patch fixes the state change (Execute to Idle) bug.
related-to-bug:
7336622
Change-Id: Ied1891cbbd73c26ae635d094ab9eb043ba8ce2d6
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Ying Wang [Mon, 15 Oct 2012 20:17:34 +0000 (13:17 -0700)]
am
2df010e4: Merge "CleanSpec.mk should sit at the root of a git project." into jb-mr1-dev
* commit '
2df010e4156a6778e45457062bb7ed165379304c':
CleanSpec.mk should sit at the root of a git project.
Ying Wang [Mon, 15 Oct 2012 20:14:08 +0000 (13:14 -0700)]
Merge "CleanSpec.mk should sit at the root of a git project." into jb-mr1-dev
Greg Hackmann [Mon, 15 Oct 2012 19:11:48 +0000 (12:11 -0700)]
am
b54c514c: Merge "hwc: protect on-screen gscaler buffers" into jb-mr1-dev
* commit '
b54c514c7e429d3a50bed7c68370babbf1b2b47c':
hwc: protect on-screen gscaler buffers
Ying Wang [Mon, 15 Oct 2012 19:10:05 +0000 (12:10 -0700)]
am
5403f3c9: Merge "Don\'t call my-dir" into jb-mr1-dev
* commit '
5403f3c9447193abd30ecc25245a95af03d45d14':
Don't call my-dir
Greg Hackmann [Mon, 15 Oct 2012 19:07:53 +0000 (12:07 -0700)]
Merge "hwc: protect on-screen gscaler buffers" into jb-mr1-dev
Ying Wang [Mon, 15 Oct 2012 19:06:21 +0000 (12:06 -0700)]
CleanSpec.mk should sit at the root of a git project.
Usually you need only 1 CleanSpec.mk for a git project.
Change-Id: I95a6ce590a88f1717f5a32929311f1861af22a20
Ying Wang [Mon, 15 Oct 2012 19:04:41 +0000 (12:04 -0700)]
Merge "Don't call my-dir" into jb-mr1-dev
Ying Wang [Mon, 15 Oct 2012 18:43:29 +0000 (11:43 -0700)]
Don't call my-dir
Because this is a "config" makefile which will be included in the middle
of another Android.mk, while the build system depends on my-dir to set
up LOCAL_MODULE_MAKEFILE, so the value of LOCAL_MODULE_MAKEFILE is
changed from the point where mobicore/common/LogWrapper/Android.mk is
included. That leads to incorrect dependency of export_includes.
Change-Id: I6af1e1cf4574d9ed15bf6d82bdf6a0815fb667ce
Dima Zavin [Mon, 15 Oct 2012 18:23:20 +0000 (11:23 -0700)]
am
f046c50a: mobicore: McClient: add cleanspec so include exports are picked up
* commit '
f046c50ad3030aed0dd4d0ca6e30d2c30f8458e4':
mobicore: McClient: add cleanspec so include exports are picked up
Dima Zavin [Mon, 15 Oct 2012 18:00:11 +0000 (11:00 -0700)]
mobicore: McClient: add cleanspec so include exports are picked up
Change-Id: I88896728c53182e1b80fa2280d470a6eadacecc8
Signed-off-by: Dima Zavin <dima@android.com>
The Android Open Source Project [Mon, 15 Oct 2012 14:39:26 +0000 (07:39 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I36b01d357124ec3cc9a4301ade13a44c2c524a3a
The Android Automerger [Fri, 12 Oct 2012 23:34:36 +0000 (16:34 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Greg Hackmann [Wed, 10 Oct 2012 23:57:24 +0000 (16:57 -0700)]
hwc: protect on-screen gscaler buffers
If the display pipeline gets too far ahead then it may try to reuse a
Gscaler destination buffer while it's still on-screen. Protect against
by setting the destination buffer's acquire fence, using the fence
obtained when it was sent on-screen.
Bug:
7319537
Change-Id: Ibac5da4b3e4b50c2413214a390abea64c9c56868
Signed-off-by: Greg Hackmann <ghackmann@google.com>
The Android Automerger [Fri, 12 Oct 2012 18:50:06 +0000 (11:50 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Benoit Goby [Fri, 12 Oct 2012 18:10:28 +0000 (11:10 -0700)]
am
a37db02b: hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done
* commit '
a37db02bd1f444fc949270cd0f8d6a9d178b8965':
hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done
Dima Zavin [Fri, 12 Oct 2012 18:04:13 +0000 (11:04 -0700)]
am
33aa35f1: libgscaler: enable/disable hardware content protection during drm playback
* commit '
33aa35f1c81c92e5b44ddc898fed85ad39e1908b':
libgscaler: enable/disable hardware content protection during drm playback
Jungtae Kim [Fri, 12 Oct 2012 18:04:12 +0000 (11:04 -0700)]
am
05e76763: hardware: samsung_slsi: exynos5: add secure path configure API
* commit '
05e767638571bc50d7a26471fbe07005f3c875fa':
hardware: samsung_slsi: exynos5: add secure path configure API
The Android Automerger [Fri, 12 Oct 2012 17:26:55 +0000 (10:26 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Benoit Goby [Mon, 8 Oct 2012 18:06:01 +0000 (11:06 -0700)]
hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done
Bug:
7286984
Change-Id: I1e607d524dd96738a193e8fb40d30c38fe39e7f6
The Android Automerger [Fri, 12 Oct 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dima Zavin [Fri, 5 Oct 2012 23:04:52 +0000 (16:04 -0700)]
libgscaler: enable/disable hardware content protection during drm playback
Bug:
7287429
Change-Id: Ife33062c8e1ee961139e8f3b50720ea43c2882e3
Signed-off-by: Dima Zavin <dima@android.com>
Jungtae Kim [Tue, 2 Oct 2012 23:08:56 +0000 (16:08 -0700)]
hardware: samsung_slsi: exynos5: add secure path configure API
The library includes two interfaces:
- CP_Enable_Path_Protection()
- CP_Disable_Path_Protection()
The first one is should be called before start of DRM playback.
The second one is should be called after end of DRM playback
Bug:
7287429
Change-Id: I44aab1cca7638fb8eac3d3fc90154c5382d8c71a
Signed-off-by: Jungtae Kim <jt1217.kim@samsung.com>
[ dima: fixed extern to C and make files ]
Signed-off-by: Dima Zavin <dima@android.com>
Benoit Goby [Fri, 12 Oct 2012 00:13:37 +0000 (17:13 -0700)]
am
cb4ed2fd: hwc: Implement blank per display
* commit '
cb4ed2fdb7e1242de8d61dba88ed23fe5f43a668':
hwc: Implement blank per display
The Android Automerger [Thu, 11 Oct 2012 23:26:41 +0000 (16:26 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Benoit Goby [Sat, 22 Sep 2012 02:14:08 +0000 (19:14 -0700)]
hwc: Implement blank per display
Bug:
7286984
Change-Id: I7382ca332de3b4035573349227b06c43dee38f86
The Android Automerger [Thu, 11 Oct 2012 15:19:26 +0000 (08:19 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 15:05:27 +0000 (08:05 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I52a831d8836bdb95f906bbaf6fce23f118aad20b
The Android Automerger [Thu, 11 Oct 2012 14:03:58 +0000 (07:03 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 12:57:35 +0000 (05:57 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie7c1d6548cbbf6a143a734498d0df8cf6aa7b1ac
Sanghee Kim [Wed, 10 Oct 2012 22:25:26 +0000 (15:25 -0700)]
am
3f32ce53: exynos5: hwc: add dst\'s crop size alignment.
* commit '
3f32ce537a7870cff6ca32e34a8d965d2fa85172':
exynos5: hwc: add dst's crop size alignment.
Sanghee Kim [Wed, 10 Oct 2012 03:04:23 +0000 (20:04 -0700)]
exynos5: hwc: add dst's crop size alignment.
Bug :
7274341
Change-Id: Icc4b631e81ddfd432bbd7902fa033d4b187b9273
Signed-off-by: Sanghee Kim <haya93@samsung.com>
The Android Automerger [Wed, 10 Oct 2012 21:06:45 +0000 (14:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sungjoong Kang [Wed, 10 Oct 2012 17:41:25 +0000 (10:41 -0700)]
am
07ed0359: hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method
* commit '
07ed03595bbba4e9ee5f8c10fa6637e2dc9d0569':
hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method
The Android Open Source Project [Wed, 10 Oct 2012 16:45:13 +0000 (09:45 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I354767f1c1a08ea76bfba48c1a8e3f0700f445b9
The Android Automerger [Wed, 10 Oct 2012 15:56:12 +0000 (08:56 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:35 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sungjoong Kang [Wed, 10 Oct 2012 04:12:15 +0000 (21:12 -0700)]
hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method
This patch fixes the case that GPS Processing Method field is not
set in EXIF data.
BUG:
7318174
Change-Id: Iad9059072e2b9e27d4c2e90543a966dcd7a26f7a
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Alex Ray [Wed, 10 Oct 2012 01:19:56 +0000 (18:19 -0700)]
am
3db6fe61: libcamera2: Round instead of truncate GPS Coords
* commit '
3db6fe61b1cf514d4b9030d137434dddbb6ce3f5':
libcamera2: Round instead of truncate GPS Coords
Sungjoong Kang [Wed, 10 Oct 2012 01:19:55 +0000 (18:19 -0700)]
am
9c046e3a: hardware: samsung_slsi: libcamera2: Change square aspect resolution
* commit '
9c046e3a60c50acce5e390c1caf1864cacc3b584':
hardware: samsung_slsi: libcamera2: Change square aspect resolution
Hyeonmyeong Choi [Wed, 10 Oct 2012 01:19:55 +0000 (18:19 -0700)]
am
a038aa84: hardware: samsung_slsi: libcamera2: Fixed release stream bug.
* commit '
a038aa84011c540c88d997107e80a9b6394e9180':
hardware: samsung_slsi: libcamera2: Fixed release stream bug.
Sungjoong Kang [Wed, 10 Oct 2012 01:19:54 +0000 (18:19 -0700)]
am
32cf9401: hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress
* commit '
32cf94013c9ba94ffaab68f942c7926ed007956f':
hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress
The Android Automerger [Tue, 9 Oct 2012 23:07:23 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 22:39:06 +0000 (15:39 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Alex Ray [Tue, 9 Oct 2012 21:35:41 +0000 (14:35 -0700)]
libcamera2: Round instead of truncate GPS Coords
Bug:
6970573
Change-Id: Ie984a945ce5a2e4a552bd33353ee0de60a64fc59
Sungjoong Kang [Tue, 9 Oct 2012 19:00:51 +0000 (12:00 -0700)]
hardware: samsung_slsi: libcamera2: Change square aspect resolution
Under VDIS, maximum height of scaler output is 1080.
This patch changes the resolution of square aspect resolution
to 1024 by 1024.
Also removed VDIS and 3DNR mismatch case.
BUG:
7308846
Change-Id: Ia384082ef125263161ac568bef4c3ae74d1984c6
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Hyeonmyeong Choi [Tue, 9 Oct 2012 00:19:00 +0000 (09:19 +0900)]
hardware: samsung_slsi: libcamera2: Fixed release stream bug.
This patch fixed bug that could not release recording stream.
BUG:
7300841
Change-Id: Icbbe4f23b24a410a0686c57f7ce5b3b9cacbebe6
Signed-off-by: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Sungjoong Kang [Mon, 8 Oct 2012 23:15:15 +0000 (16:15 -0700)]
hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress
Apply the count of pending JPEG output to the result of
get_in_progress_count.
BUG:
7276954
Change-Id: I89aa1311618423d089c9572c9a292d90eb5de92d
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Rebecca Schultz Zavin [Tue, 9 Oct 2012 20:35:56 +0000 (13:35 -0700)]
am
2ed2aecf: Revert "STOPSHIP libcamera2: remove device metadata"
* commit '
2ed2aecf5abca549c0f065f9b0fe043f325e42a8':
Revert "STOPSHIP libcamera2: remove device metadata"
Rebecca Schultz Zavin [Tue, 9 Oct 2012 20:35:55 +0000 (13:35 -0700)]
am
bd4aea1e: Revert "STOPSHIP libcamera2: remove device metadata"
* commit '
bd4aea1e512f4b4bfa5e3fc7a2ce8f0fa74fd27d':
Revert "STOPSHIP libcamera2: remove device metadata"
Rebecca Schultz Zavin [Tue, 9 Oct 2012 19:10:49 +0000 (12:10 -0700)]
Revert "STOPSHIP libcamera2: remove device metadata"
This reverts commit
1d47061ad52ca8f85ccd22e891f9427d020d9a0f.
Bug:
7065917
Change-Id: Iddcb2e0a89625c438516b1d7a01ca039d078b677
Rebecca Schultz Zavin [Tue, 9 Oct 2012 19:10:44 +0000 (12:10 -0700)]
Revert "STOPSHIP libcamera2: remove device metadata"
This reverts commit
6c7b0add3629c0fae49a947e2639892c7cf1b074.
Bug:
7065917
Change-Id: I3685b40708bf17eed1a62ac90ae91ff564667c4e
Rebecca Schultz Zavin [Tue, 9 Oct 2012 16:40:50 +0000 (09:40 -0700)]
am
ab73a889: Align secure video surfaces to 1 MB
* commit '
ab73a889ad0d4ea853ab41a9f5b0cea11cac3fd8':
Align secure video surfaces to 1 MB
Rebecca Schultz Zavin [Sat, 6 Oct 2012 16:20:31 +0000 (09:20 -0700)]
Align secure video surfaces to 1 MB
Change-Id: I6de31d4f07b31cbc40d08d8cddb076149455dc55
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
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
projects / GitHub / LineageOS / android_hardware_samsung_slsi_exynos5.git / log