SeungBeom Kim [Tue, 20 Nov 2012 21:39:23 +0000 (13:39 -0800)]
am
3a0eba15: am
a7fc5930: exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
* commit '
3a0eba15a8d165f8a75ace07cbbe74c43555bcb7':
exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
SeungBeom Kim [Tue, 20 Nov 2012 21:36:43 +0000 (13:36 -0800)]
am
a7fc5930: exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
* commit '
a7fc593060b63bdeb9c3c5295157b04944d2a524':
exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
SeungBeom Kim [Tue, 20 Nov 2012 03:33:33 +0000 (12:33 +0900)]
exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.
Add config dynamic change of "encode component".
Bug:
7546690
Change-Id: I82b043d51aa8295929201ce26c2b1afd5bcdb0e8
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Greg Hackmann [Tue, 2 Oct 2012 18:39:13 +0000 (11:39 -0700)]
hwc: set retire fence fds
Change-Id: Iece6483e6402a9a425086b8ee8e67e17909b7d8a
Kenny Root [Wed, 14 Nov 2012 23:52:02 +0000 (15:52 -0800)]
Remove unnecessary dependency on keystore_client
Change-Id: I801740653a6a13cb85d85204e2c8fa1b5ea2f879
(cherry picked from commit
60b72f63f6d36cfc87319bd720a4467fece6a548)
The Android Open Source Project [Tue, 6 Nov 2012 20:27:31 +0000 (12:27 -0800)]
am
29434681: (-s ours) am
f97103b5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
29434681bcb2cf348411f790887473a41855baf8':
The Android Open Source Project [Tue, 6 Nov 2012 20:24:31 +0000 (12:24 -0800)]
am
f97103b5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
f97103b5f0e5a65a81f60bbe39cd563b655ce020':
The Android Open Source Project [Tue, 6 Nov 2012 20:17:45 +0000 (12:17 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I088f7356b684381f971b7e9f6773ba24f7f9b62a
The Android Open Source Project [Fri, 2 Nov 2012 14:30:19 +0000 (07:30 -0700)]
am
1273f1b7: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
1273f1b7ace1772bc115f4252f2925de0c5c102d':
The Android Open Source Project [Fri, 2 Nov 2012 14:28:26 +0000 (07:28 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie34407add6de1a599529f03ac8954c792c400fbe
The Android Automerger [Fri, 2 Nov 2012 02:05:29 +0000 (19:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Rebecca Schultz Zavin [Thu, 1 Nov 2012 22:25:38 +0000 (15:25 -0700)]
am
57b18438: am
d881a0ce: Allocate enough memory for HAL_PIXL_FORMAT_YV12
* commit '
57b18438ad3905465813ea88c05bb0e045a4db86':
Allocate enough memory for HAL_PIXL_FORMAT_YV12
Rebecca Schultz Zavin [Thu, 1 Nov 2012 22:22:24 +0000 (15:22 -0700)]
am
d881a0ce: Allocate enough memory for HAL_PIXL_FORMAT_YV12
* commit '
d881a0ce901d839282ba2d4d724b9ae25c9d4e89':
Allocate enough memory for HAL_PIXL_FORMAT_YV12
Rebecca Schultz Zavin [Thu, 1 Nov 2012 00:05:48 +0000 (17:05 -0700)]
Allocate enough memory for HAL_PIXL_FORMAT_YV12
Previously we were not allocating enough memory to align
the uv planes to 16 pixels.
We were allocating:
h * align(w,16) * 3 / 2 bytes
This should be:
h * align(w,16) + h * align(align(w,16)/2, 16)
Bug:
7431048
Change-Id: Iaba969795e8d20c29ee0b703af5dd884a4c88d2e
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
The Android Open Source Project [Wed, 31 Oct 2012 16:22:27 +0000 (09:22 -0700)]
am
4ed896ce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
4ed896ce6a2e53de38d6d00fbe8750e48b2925ff':
The Android Open Source Project [Wed, 31 Oct 2012 16:17:40 +0000 (09:17 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I655ef2dc4e9a7bd82b72287f41ba69a8009720ae
The Android Automerger [Fri, 26 Oct 2012 23:22:58 +0000 (16:22 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sungjoong Kang [Thu, 25 Oct 2012 23:06:37 +0000 (16:06 -0700)]
am
0ad5fc61: am
34d2b94a: hardware: samsung_slsi: libcamera2: Fix flash torch mode
* commit '
0ad5fc615d65b3730af0f5324ab77608bdec0c15':
hardware: samsung_slsi: libcamera2: Fix flash torch mode
Sungjoong Kang [Thu, 25 Oct 2012 23:04:33 +0000 (16:04 -0700)]
am
34d2b94a: hardware: samsung_slsi: libcamera2: Fix flash torch mode
* commit '
34d2b94a1d314524aa47d1c9071d9b5027332d65':
hardware: samsung_slsi: libcamera2: Fix flash torch mode
Sungjoong Kang [Thu, 25 Oct 2012 06:55:16 +0000 (23:55 -0700)]
hardware: samsung_slsi: libcamera2: Fix flash torch mode
This patch enables flash torch mode for flashlight apps.
BUG :
7411246
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Change-Id: I293ebf1899d396ca3fd1f4a2c2e9d9e97e99ccc1
The Android Automerger [Thu, 25 Oct 2012 20:42:28 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sungjoong Kang [Thu, 25 Oct 2012 02:50:44 +0000 (19:50 -0700)]
am
d8a9ba56: am
c48f0170: hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
* commit '
d8a9ba56c466363a667db929d6c7e4d7f1387456':
hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
Sungjoong Kang [Thu, 25 Oct 2012 02:50:43 +0000 (19:50 -0700)]
am
254446de: am
ca714238: hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
* commit '
254446de077e616565bda36a20f54d7d7004b744':
hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
Sungjoong Kang [Thu, 25 Oct 2012 02:48:55 +0000 (19:48 -0700)]
am
c48f0170: hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
* commit '
c48f0170bf56ff4911998bc531e8547bcf0d024f':
hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
Sungjoong Kang [Thu, 25 Oct 2012 02:48:55 +0000 (19:48 -0700)]
am
ca714238: hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
* commit '
ca714238a7b555c412637d25006c17f1f0ce2751':
hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
Sungjoong Kang [Wed, 24 Oct 2012 06:50:12 +0000 (23:50 -0700)]
hardware: samsung_slsi: libcamera2: Add AF state reset on mode change
Resets AF state on AF mode change.
AF cancellation works properly in manual(infinite) mode.
Removed some compile warnings.
BUG :
6970465
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
Change-Id: I9d577c5f57a0cebd31fb50954fee555722bae6a7
Sungjoong Kang [Fri, 12 Oct 2012 03:11:50 +0000 (20:11 -0700)]
hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
This patch synchornizes AF mode metadata and trigger actions.
BUG:
7318812
Change-Id: I0db3fdf0f85a37bc1c6e0242bde7cba6c69e2746
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>
The Android Automerger [Wed, 24 Oct 2012 23:57:04 +0000 (16:57 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Benoit Goby [Wed, 24 Oct 2012 19:42:53 +0000 (12:42 -0700)]
am
366d3ea9: am
56208452: hwc: Add properties to control hdcp and color range
* commit '
366d3ea9d2fa91d58e5f06b8d9c99cef45db0917':
hwc: Add properties to control hdcp and color range
Benoit Goby [Wed, 24 Oct 2012 19:40:57 +0000 (12:40 -0700)]
am
56208452: hwc: Add properties to control hdcp and color range
* commit '
56208452f4f55fbb2b8e39355f5308fe08603e6e':
hwc: Add properties to control hdcp and color range
Benoit Goby [Wed, 24 Oct 2012 00:49:52 +0000 (17:49 -0700)]
hwc: Add properties to control hdcp and color range
Bug:
7395373
Bug:
7259555
Change-Id: Ib8280a892bce123b165df51c5746775e2cf03bdf
The Android Automerger [Tue, 23 Oct 2012 23:47:11 +0000 (16:47 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Younghwan Joo [Tue, 23 Oct 2012 23:25:18 +0000 (16:25 -0700)]
am
dc3932a6: am
a0648fc7: hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
* commit '
dc3932a6f257c1ed958cd9262eff41293c900096':
hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
Younghwan Joo [Tue, 23 Oct 2012 23:25:17 +0000 (16:25 -0700)]
am
64335cdc: am
6a87e47a: hardware: samsung_slsi: libcamera2: clipping fd score to the max score
* commit '
64335cdc68ea0037f7d03ff60d0e581ed7dcf24a':
hardware: samsung_slsi: libcamera2: clipping fd score to the max score
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
The Android Automerger [Tue, 23 Oct 2012 13:59:34 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sungjoong Kang [Mon, 22 Oct 2012 23:55:29 +0000 (16:55 -0700)]
am
61752cf1: am
3c17a3f7: hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
* commit '
61752cf12b26800c4ca3b062a6924e503d9bfc23':
hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes
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
The Android Automerger [Fri, 19 Oct 2012 13:59:48 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Greg Hackmann [Fri, 19 Oct 2012 04:07:18 +0000 (21:07 -0700)]
am
0bf23a4c: am
92b0aadb: hwc: adjust protected content scaling for gscaler width constraints
* commit '
0bf23a4c6f54333c896f74a7d434a7c15adf99a6':
hwc: adjust protected content scaling for gscaler width constraints
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>
The Android Automerger [Thu, 18 Oct 2012 13:59:48 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
James Dong [Thu, 18 Oct 2012 03:21:45 +0000 (20:21 -0700)]
am
895156de: am
d08bf0b2: Merge "Added error handling in the state change from "Load state" to "Idle state"." into jb-mr1-dev
* commit '
895156dea6431fec87200f3b943abafe19c152c2':
Added error handling in the state change from "Load state" to "Idle state".
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:45:50 +0000 (17:45 -0700)]
am
770097a8: am
0757ed8e: hardware: samsung_slsi: libcamera2: Add 15fps mode support
* commit '
770097a8c0ab093e347f5d7c28c5b7467cfff440':
hardware: samsung_slsi: libcamera2: Add 15fps mode support
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:41:21 +0000 (16:41 -0700)]
am
386c0203: am
2f9c21c5: Merge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode" into jb-mr1-dev
* commit '
386c0203dc459d296430c520636ecf57be97b7c0':
hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode
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>
The Android Automerger [Wed, 17 Oct 2012 13:59:36 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
DongJin Park [Wed, 17 Oct 2012 06:49:56 +0000 (23:49 -0700)]
am
fd75ce97: am
2821a826: mobicore: update daemon to handle MobiCore halt status
* commit '
fd75ce97c008976f763d5106e03bc61d2b375093':
mobicore: update daemon to handle MobiCore halt status
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
The Android Automerger [Wed, 17 Oct 2012 00:30:50 +0000 (17:30 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Greg Hackmann [Tue, 16 Oct 2012 23:07:38 +0000 (16:07 -0700)]
am
d193f787: am
5d99ec51: hwc: set Gscaler to narrow RGB for YUV surfaces
* commit '
d193f78749f9451b7ff34d582e32d8faa2e423c1':
hwc: set Gscaler to narrow RGB for YUV surfaces
Greg Hackmann [Tue, 16 Oct 2012 23:07:37 +0000 (16:07 -0700)]
am
9cd7e979: am
bcd3f11d: libgscaler: add csc range field
* commit '
9cd7e979c812b9b151a372ebfcc7ac733b0b51cb':
libgscaler: add csc range field
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>
The Android Automerger [Tue, 16 Oct 2012 13:59:37 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
SeungBeom Kim [Tue, 16 Oct 2012 04:08:36 +0000 (21:08 -0700)]
am
23e6502e: 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 '
23e6502e2bfabd2e7c97691b5733070c5ab2fdc2':
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 [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:19:01 +0000 (13:19 -0700)]
am
5aa93b71: am
2df010e4: Merge "CleanSpec.mk should sit at the root of a git project." into jb-mr1-dev
* commit '
5aa93b71ca38320677dd6f9689873279e5c16876':
CleanSpec.mk should sit at the root of a git project.
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:13:27 +0000 (12:13 -0700)]
am
e09990ad: am
b54c514c: Merge "hwc: protect on-screen gscaler buffers" into jb-mr1-dev
* commit '
e09990ad1bd4957ac643ea7e292793211a25c75f':
hwc: protect on-screen gscaler buffers
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:11:48 +0000 (12:11 -0700)]
am
175891ef: am
5403f3c9: Merge "Don\'t call my-dir" into jb-mr1-dev
* commit '
175891efcec34f752573a2779b0890ed159bad98':
Don't call my-dir
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:25:09 +0000 (11:25 -0700)]
am
c95c1af0: am
f046c50a: mobicore: McClient: add cleanspec so include exports are picked up
* commit '
c95c1af0b8e910f638919cb3a5c1236fa17fa8dd':
mobicore: McClient: add cleanspec so include exports are picked up
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:43:01 +0000 (07:43 -0700)]
am
b04853d0: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
b04853d02d28d726088cc3a17e8494d72b94832d':
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:14:30 +0000 (11:14 -0700)]
am
a7048da3: am
a37db02b: hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done
* commit '
a7048da3f65a29745c74fc2f77a79f338b42abb7':
hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done
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:10:20 +0000 (11:10 -0700)]
am
6bfef851: am
33aa35f1: libgscaler: enable/disable hardware content protection during drm playback
* commit '
6bfef85159e3e7dc586178ec38ee37f11d0466c9':
libgscaler: enable/disable hardware content protection during drm playback
Jungtae Kim [Fri, 12 Oct 2012 18:10:18 +0000 (11:10 -0700)]
am
a7cb9221: am
05e76763: hardware: samsung_slsi: exynos5: add secure path configure API
* commit '
a7cb922115512f6ce6ba3c667c97c452180055af':
hardware: samsung_slsi: exynos5: add secure path configure API
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
projects / GitHub / LineageOS / android_hardware_samsung_slsi_exynos5.git / log