GitHub/LineageOS/android_hardware_samsung_slsi_exynos5.git
12 years agoam 254446de: am ca714238: hardware: samsung_slsi: libcamera2: Synchronize AF mode...
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

12 years agoam ca714238: hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
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

12 years agohardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger
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>
12 years agoam 366d3ea9: am 56208452: hwc: Add properties to control hdcp and color range
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

12 years agoam 56208452: 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

12 years agohwc: 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

12 years agoam dc3932a6: am a0648fc7: hardware: samsung_slsi: libcamera2: ensure disabling flash...
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

12 years agoam 64335cdc: am 6a87e47a: hardware: samsung_slsi: libcamera2: clipping fd score to...
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

12 years agoam a0648fc7: hardware: samsung_slsi: libcamera2: ensure disabling flash at video...
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

12 years agoam 6a87e47a: hardware: samsung_slsi: libcamera2: clipping fd score to the max score
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

12 years agohardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot
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

12 years agohardware: samsung_slsi: libcamera2: clipping fd score to the max score
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

12 years agoam 61752cf1: am 3c17a3f7: hardware: samsung_slsi: libcamera2: Fix for supporting...
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

12 years agoam 3c17a3f7: 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

12 years agohardware: 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

12 years agoam 0bf23a4c: am 92b0aadb: hwc: adjust protected content scaling for gscaler width...
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

12 years agoam 92b0aadb: 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

12 years agohwc: 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>
12 years agoam 895156de: am d08bf0b2: Merge "Added error handling in the state change from "Load...
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".

12 years agoam d08bf0b2: Merge "Added error handling in the state change from "Load state" to...
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".

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

12 years agoam 770097a8: am 0757ed8e: hardware: samsung_slsi: libcamera2: Add 15fps mode support
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

12 years agoam 0757ed8e: 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

12 years agohardware: 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>
12 years agoam 386c0203: am 2f9c21c5: Merge "hardware: samsung_slsi: libcamera2: Remove fixed...
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

12 years agoam 2f9c21c5: Merge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recordin...
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

12 years agoMerge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode" into...
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

12 years agoAdded error handling in the state change from "Load state" to "Idle state".
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>
12 years agoam fd75ce97: am 2821a826: mobicore: update daemon to handle MobiCore halt status
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

12 years agoam 2821a826: 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

12 years agomobicore: 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: 71792277336639

Change-Id: I87dc8acc3fd7e56a6a0dd2c9be0c8a5b995e6c87
Signed-off-by: DongJin Park <djpax.park@samsung.com>
12 years agohardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode
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

12 years agoam d193f787: am 5d99ec51: hwc: set Gscaler to narrow RGB for YUV surfaces
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

12 years agoam 9cd7e979: am bcd3f11d: libgscaler: add csc range field
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

12 years agoam 5d99ec51: hwc: set Gscaler to narrow RGB for YUV surfaces
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

12 years agoam bcd3f11d: libgscaler: add csc range field
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

12 years agohwc: set Gscaler to narrow RGB for YUV surfaces
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>
12 years agolibgscaler: add csc range field
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>
12 years agoam 23e6502e: am af4568d1: OMX encode component has problem on "idle->execute->idle...
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.

12 years agoam af4568d1: OMX encode component has problem on "idle->execute->idle state change...
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.

12 years agoOMX encode component has problem on "idle->execute->idle state change" without input...
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>
12 years agoam 5aa93b71: am 2df010e4: Merge "CleanSpec.mk should sit at the root of a git project...
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.

12 years agoam 2df010e4: Merge "CleanSpec.mk should sit at the root of a git project." into jb...
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.

12 years agoMerge "CleanSpec.mk should sit at the root of a git project." into jb-mr1-dev
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

12 years agoam e09990ad: am b54c514c: Merge "hwc: protect on-screen gscaler buffers" into jb...
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

12 years agoam b54c514c: Merge "hwc: protect on-screen gscaler buffers" 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

12 years agoam 175891ef: am 5403f3c9: Merge "Don\'t call my-dir" into jb-mr1-dev
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

12 years agoam 5403f3c9: Merge "Don\'t call my-dir" into jb-mr1-dev
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

12 years agoMerge "hwc: protect on-screen gscaler buffers" into jb-mr1-dev
Greg Hackmann [Mon, 15 Oct 2012 19:07:53 +0000 (12:07 -0700)]
Merge "hwc: protect on-screen gscaler buffers" into jb-mr1-dev

12 years agoCleanSpec.mk should sit at the root of a git project.
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

12 years agoMerge "Don't call my-dir" into jb-mr1-dev
Ying Wang [Mon, 15 Oct 2012 19:04:41 +0000 (12:04 -0700)]
Merge "Don't call my-dir" into jb-mr1-dev

12 years agoDon't call my-dir
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

12 years agoam c95c1af0: am f046c50a: mobicore: McClient: add cleanspec so include exports are...
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

12 years agoam f046c50a: 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

12 years agomobicore: 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>
12 years agoam b04853d0: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
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':

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

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

12 years agohwc: protect on-screen gscaler buffers
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>
12 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

12 years agoam a7048da3: am a37db02b: hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is...
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

12 years agoam a37db02b: 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

12 years agoam 6bfef851: am 33aa35f1: libgscaler: enable/disable hardware content protection...
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

12 years agoam a7cb9221: am 05e76763: hardware: samsung_slsi: exynos5: add secure path configure API
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

12 years agoam 33aa35f1: libgscaler: enable/disable hardware content protection during drm playback
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

12 years agoam 05e76763: hardware: samsung_slsi: exynos5: add secure path configure API
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

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

12 years agohwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done
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

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

12 years agolibgscaler: enable/disable hardware content protection during drm playback
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>
12 years agohardware: samsung_slsi: exynos5: add secure path configure API
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>
12 years agoam a0f3ee60: am cb4ed2fd: hwc: Implement blank per display
Benoit Goby [Fri, 12 Oct 2012 00:54:26 +0000 (17:54 -0700)]
am a0f3ee60: am cb4ed2fd: hwc: Implement blank per display

* commit 'a0f3ee60a54dd87b463f9b04220b57aac6cf1da7':
  hwc: Implement blank per display

12 years agoam cb4ed2fd: hwc: Implement blank per display
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

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

12 years agohwc: Implement blank per display
Benoit Goby [Sat, 22 Sep 2012 02:14:08 +0000 (19:14 -0700)]
hwc: Implement blank per display

Bug: 7286984
Change-Id: I7382ca332de3b4035573349227b06c43dee38f86

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

12 years agoam 0da73557: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 11 Oct 2012 15:08:14 +0000 (08:08 -0700)]
am 0da73557: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0da73557cb81ba7940894fedb6193447ed9a9b91':

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

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

12 years agoam 462002f8: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 11 Oct 2012 13:02:10 +0000 (06:02 -0700)]
am 462002f8: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '462002f84a1e2a0354b67d11f8b445b60c8ecf82':

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

12 years agoam d80f416d: am 3f32ce53: exynos5: hwc: add dst\'s crop size alignment.
Sanghee Kim [Wed, 10 Oct 2012 22:27:19 +0000 (15:27 -0700)]
am d80f416d: am 3f32ce53: exynos5: hwc: add dst\'s crop size alignment.

* commit 'd80f416d13f26fa701ae871aad8d73f77bf5adb9':
  exynos5: hwc: add dst's crop size alignment.

12 years agoam 3f32ce53: exynos5: hwc: add dst\'s crop size alignment.
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.

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

12 years agoam bb909347: am 07ed0359: hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing...
Sungjoong Kang [Wed, 10 Oct 2012 17:43:29 +0000 (10:43 -0700)]
am bb909347: am 07ed0359: hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method

* commit 'bb9093477c6395107fd1482a6a83dcecf71a5b3c':
  hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method

12 years agoam 07ed0359: hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method
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

12 years agoam a388b6f3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
The Android Open Source Project [Wed, 10 Oct 2012 16:47:49 +0000 (09:47 -0700)]
am a388b6f3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'a388b6f3158f06c3c2c6b8d16d35d87b9ec028a5':

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

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

12 years agomerge in jb-mr1-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

12 years agohardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method
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>
12 years agoam 7d0efc0f: am 3db6fe61: libcamera2: Round instead of truncate GPS Coords
Alex Ray [Wed, 10 Oct 2012 01:22:24 +0000 (18:22 -0700)]
am 7d0efc0f: am 3db6fe61: libcamera2: Round instead of truncate GPS Coords

* commit '7d0efc0fc33cc12e51698d91112c2b9186cf8631':
  libcamera2: Round instead of truncate GPS Coords

12 years agoam 34295d66: am 9c046e3a: hardware: samsung_slsi: libcamera2: Change square aspect...
Sungjoong Kang [Wed, 10 Oct 2012 01:22:23 +0000 (18:22 -0700)]
am 34295d66: am 9c046e3a: hardware: samsung_slsi: libcamera2: Change square aspect resolution

* commit '34295d66c84d0c7cee14b306f34eccc1c18e7988':
  hardware: samsung_slsi: libcamera2: Change square aspect resolution

12 years agoam a8b0caf2: am a038aa84: hardware: samsung_slsi: libcamera2: Fixed release stream...
Hyeonmyeong Choi [Wed, 10 Oct 2012 01:22:22 +0000 (18:22 -0700)]
am a8b0caf2: am a038aa84: hardware: samsung_slsi: libcamera2: Fixed release stream bug.

* commit 'a8b0caf20fa74cc390fa149d10db5cf61f9cccbd':
  hardware: samsung_slsi: libcamera2: Fixed release stream bug.

12 years agoam b7d46711: am 32cf9401: hardware: samsung_slsi: libcamera2: Apply pending JPEG...
Sungjoong Kang [Wed, 10 Oct 2012 01:22:22 +0000 (18:22 -0700)]
am b7d46711: am 32cf9401: hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress

* commit 'b7d4671187d6a9101fe1ebf74814c886a8f31a34':
  hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress

12 years agoam 3db6fe61: libcamera2: Round instead of truncate GPS Coords
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

12 years agoam 9c046e3a: hardware: samsung_slsi: libcamera2: Change square aspect resolution
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

12 years agoam a038aa84: hardware: samsung_slsi: libcamera2: Fixed release stream bug.
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.

12 years agoam 32cf9401: hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress
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