replicant:hardware_ti_omap4xxx.git
3 years agoDisable hardware video encoding/decoding replicant-4.2
Paul Kocialkowski [Tue, 31 Dec 2013 15:40:15 +0000 (16:40 +0100)]
Disable hardware video encoding/decoding

Change-Id: I5244230538db1b9b83792cf530583da603c7a5d1
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
3 years agoGet rid of proprietary firmware
Paul Kocialkowski [Tue, 31 Dec 2013 15:35:43 +0000 (16:35 +0100)]
Get rid of proprietary firmware

Change-Id: I12604f28cddc7515238055dcd8abe10938d267d8
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
4 years agoomap4xxx: add flag to allow custom libion
Hashcode [Sat, 15 Dec 2012 07:48:47 +0000 (23:48 -0800)]
omap4xxx: add flag to allow custom libion

Due to kernel changes I need to stop the omap4xxx/libion via
BOARD_USES_CUSTOM_LIBION flag and instead use a custom libion
in my device trees.

Change-Id: Ic48e8c51456c76dfd9bca00cb59581deb2cfc510
Signed-off-by: Hashcode <hashcode0f@gmail.com>
4 years ago[1/3] omap4xxx: Allow custom DOMX source instead of Google DOMX default
Hashcode [Mon, 21 Jan 2013 05:18:50 +0000 (21:18 -0800)]
[1/3] omap4xxx: Allow custom DOMX source instead of Google DOMX default

Part 1 of 3 patches: To allow omap4 devices to use custom "domx" source
via a new BoardConfig.mk item:
TI_CUSTOM_DOMX_PATH := device/<manufacturer>/<device-name>/domx

This setting provides for 3 changes during the build:
1. In hardware/ti/omap4xxx this settings stops standard Google domx
source from being built and changes the domx reference for tiutils.
2. In frameworks/base it changes the default openmax references for
frameworks/base/media/jni/mediaeditor/Android.mk to the new location
3. In frameworks/av changes the openmax references in 5 places, and adds
new includes in ACodec.cpp, CameraSource.cpp and OMXCodec.cpp

This commit for hardware/ti/omap4xxx is based on this cherry-pick from
omapzoom (with a more descriptive BoardConfig setting name):
http://www.omapzoom.org/?p=platform/hardware/ti/omap4xxx.git;a=commitdiff;h=040534d546dbcfcff16ff1afff15c01c2822dfcc

Change-Id: I32bf75073278639dc9e4442168c7b35295beb495
Signed-off-by: Hashcode <hashcode0f@gmail.com>
4 years agohwc: Support HDMI as primary display
Mykola Ostrovskyy [Tue, 10 Jul 2012 09:54:29 +0000 (15:24 +0530)]
hwc: Support HDMI as primary display

This patch disables mirroring/docking logic when HDMI display
is used as primary instead of LCD panel.

Based on patch from Mark Tyler.

Rebased from p-ics-mr1:
9dd8ccd Support HDMI as primary display

Change-Id: Idd239a562bfc486e128b268fa31ced53412bba3a
Signed-off-by: Mykola Ostrovskyy <mykola@ti.com>
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
Signed-off-by: Tony Lofthouse <a0741364@ti.com>
4 years agohwc: Add support for FB scaling and cloning
Dandawate Saket [Thu, 12 Apr 2012 06:25:52 +0000 (11:55 +0530)]
hwc: Add support for FB scaling and cloning

Patch contains following features
1)Large frame buffer support:
     Transformation matrix for LCD and HDMI added
     to ensure correct composition and renderring
     of all UI layers
     Added support for overlay distrubution based
     on FB size and target display
2)Default HDMI display support
     Support for default HDMI display selection.
     Added HDMI best mode selection on HPD

Rebased from p-ics-mr1:
96ad001 hwc: Add support for FB scaling and cloning

Change-Id: Ia6f06d5e149656c4d79ac2d3983211a253bb3969
Signed-off-by: Lajos Molnar <molnar@ti.com>
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
4 years agohwc: fix timing issue with vsync sysfs loop
codeworkx [Sun, 16 Dec 2012 10:06:53 +0000 (11:06 +0100)]
hwc: fix timing issue with vsync sysfs loop

Change-Id: I6e0307e0fd5ea84748ddb580062b21f697512603

5 years agohwc: support vsync notification via sysfs
codeworkx [Sat, 1 Dec 2012 12:02:41 +0000 (13:02 +0100)]
hwc: support vsync notification via sysfs

Change-Id: Ie2172b5fb2e8595136f6ccb28abd9f8ce89a526f

5 years agoRevert "CameraHal: Sync AF cancel with incoming OMX events"
Eino-Ville Talvala [Thu, 8 Nov 2012 00:54:31 +0000 (16:54 -0800)]
Revert "CameraHal: Sync AF cancel with incoming OMX events"

This reverts commit b96dffd40e25d29a61f9fbd7f2e5968b5335b957.

Bug: 7495861

5 years agoCameraHal: Sync AF cancel with incoming OMX events
Emilian Peev [Mon, 22 Oct 2012 07:53:12 +0000 (10:53 +0300)]
CameraHal: Sync AF cancel with incoming OMX events

- Cancel AF is made to wait on incoming OMX events
  when AF status changes. An AF timeout is introduced
  in order not to block this call indefinitely.
- Additionally calls to 'autoFocus()' will immediately
  trigger AF callbacks if fixed modes are being used.

Bug: 6949572

Change-Id: I5f240fb6fc7fe53aecaff76d75d608dd522c1e27
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
5 years agoCameraHal: Avoid race condition during recording stop
Emilian Peev [Wed, 10 Oct 2012 12:52:54 +0000 (15:52 +0300)]
CameraHal: Avoid race condition during recording stop

- A race condition is possible when recording is stopped.
  'BaseCameraAdapter::stopVideoCapture()' is clearing
  'mVideoBuffersAvailable'. A delayed video frame from
  'AppCallbackNotifier' can return afterwards though and
  then try to query the already empty 'KeyedVector'. This
  will result in a segfault. Solution is to move the vector
  reset away from 'stopVideoCapture()' and in to
  'startVideoCapture()' where it is needed.

Bug: 7021214

Change-Id: Ic234189b49e35c990b3af70bd713a12cb762362c
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
5 years agoHWC field was renamed
Jesse Hall [Fri, 7 Sep 2012 00:15:27 +0000 (17:15 -0700)]
HWC field was renamed

Change-Id: If08258776db427c45d9ba70cfa79f4d290398ca6

5 years agoUse new surface flinger API.
Jeff Brown [Sat, 25 Aug 2012 05:35:14 +0000 (22:35 -0700)]
Use new surface flinger API.

Change-Id: I90a00bd284a5d800f0f0eac5616ffa9ce14303c0

5 years agoUpdate for cleanups in hwc interface
Jesse Hall [Tue, 21 Aug 2012 19:13:34 +0000 (12:13 -0700)]
Update for cleanups in hwc interface

Change-Id: I7851cd5ca7cd826b3b4b35e6df90ce1e2a9f4327

5 years agoUpdate the omap4xxx HWC to use the 1.0 interfaces
Andy McFadden [Thu, 16 Aug 2012 22:41:28 +0000 (15:41 -0700)]
Update the omap4xxx HWC to use the 1.0 interfaces

Switch to HWC_DEVICE_API_VERSION_1_0 and the corresponding
structures.

This change removes special-case handling for Panda, which was
using v0.2.  This will likely break the Panda display.

Change-Id: Id9ba6910ae2285d116f697bfa5af2c1f6b022ce0

5 years agoMerge "Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"" into jb-mr1-dev
James Dong [Sat, 4 Aug 2012 00:12:37 +0000 (17:12 -0700)]
Merge "Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"" into jb-mr1-dev

5 years agoMerge "Fix the build." into jb-mr1-dev
Jim Miller [Sat, 4 Aug 2012 00:11:54 +0000 (17:11 -0700)]
Merge "Fix the build." into jb-mr1-dev

5 years agoFix the build.
Jim Miller [Sat, 4 Aug 2012 00:10:58 +0000 (17:10 -0700)]
Fix the build.

Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"

This reverts commit 6e18d140dfd80193121abf35764b8dad2f369041

Change-Id: Ia2cb66fc1f88298df675b9085b16c83558dede62

5 years agoRevert "Revert Widevine 6.0.0 -> 4.5.0 libraries"
Edwin Wong [Fri, 3 Aug 2012 23:55:19 +0000 (16:55 -0700)]
Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"

This reverts commit 6e18d140dfd80193121abf35764b8dad2f369041

Change-Id: Idcedbc1cc744c42c06e5c731b3c60355414e6add

5 years agoMerge "Revert Widevine 6.0.0 -> 4.5.0 libraries" into jb-mr1-dev
Edwin Wong [Fri, 3 Aug 2012 22:52:45 +0000 (15:52 -0700)]
Merge "Revert Widevine 6.0.0 -> 4.5.0 libraries" into jb-mr1-dev

5 years agoRevert Widevine 6.0.0 -> 4.5.0 libraries
Edwin Wong [Wed, 1 Aug 2012 18:30:39 +0000 (11:30 -0700)]
Revert Widevine 6.0.0 -> 4.5.0 libraries

Includes Widevine libraries Version 4.5.0.7809

Also fixed samplePlayer's MediaCodec mode not running and
WVDrmInfoRequestStatusKey returning incorrect value.

Change-Id: I1d7df9cf3935d7fec143e326f142e974979cc69b
related-to-bug: 6929628
related-to-bug: 6833718
related-to-bug: 6889322

5 years agoam 53835e97: Merge "OMAP4:Panda: Use old hwcomposer API version for panda"
Jean-Baptiste Queru [Thu, 2 Aug 2012 23:07:38 +0000 (16:07 -0700)]
am 53835e97: Merge "OMAP4:Panda: Use old hwcomposer API version for panda"

* commit '53835e97845edf78d513010ae4faa8fc467f0a6c':
  OMAP4:Panda: Use old hwcomposer API version for panda

5 years agoMerge "OMAP4:Panda: Use old hwcomposer API version for panda"
Jean-Baptiste Queru [Thu, 2 Aug 2012 22:19:11 +0000 (15:19 -0700)]
Merge "OMAP4:Panda: Use old hwcomposer API version for panda"

5 years agoOMAP4:Panda: Use old hwcomposer API version for panda
Dan Murphy [Thu, 2 Aug 2012 20:15:48 +0000 (15:15 -0500)]
OMAP4:Panda: Use old hwcomposer API version for panda

The hwcomposer for OMAP4 is generic to the all OMAP4
processors.

Panda does not support Vsync protocal which is expected
when the HAL declares an API support level of 0.3.

Therefore indicate to the upper layers that if the product is
panda then only API level 0.2 is supported which then forces
upper layers to fake the vsync signal

Change-Id: I22a39f55ea017ced25424556ffc95b099d0a2781
Signed-off-by: Dan Murphy <dmurphy@ti.com>
5 years agoMerge "Remove libdrmdecrypt from AOSP build."
Fred [Tue, 17 Jul 2012 15:42:26 +0000 (08:42 -0700)]
Merge "Remove libdrmdecrypt from AOSP build."

5 years agoFixup ion change to old library
Rebecca Schultz Zavin [Tue, 3 Jul 2012 16:50:33 +0000 (09:50 -0700)]
Fixup ion change to old library

Missed a few places that needed updating

Change-Id: I1a483d9d85858e752df0f1d970559fcac6695856
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
5 years agoRemove libdrmdecrypt from AOSP build.
Fred [Mon, 2 Jul 2012 23:15:20 +0000 (16:15 -0700)]
Remove libdrmdecrypt from AOSP build.

Not all boards that use the omap4 chipset need to have the drm
library.  In particular, the panda does not.  The libdrmdecrypt
make file was moved from hardware/ti/omap4xxx, to vendor/ti/proprietary.

The directory libdrmdecrypt was removed in this change, and added
in change Icbeb6c5c.

The dependency on libdrmdecrypt was removed from omap4.mk and added
to tuna_common.mk in change Ia1019321.

Change-Id: Iaad4d1122809ad67869d7515c5c5009a048bb1c2

5 years agoam 692b0d66: Reconcile with jb-release
The Android Open Source Project [Fri, 29 Jun 2012 15:19:30 +0000 (08:19 -0700)]
am 692b0d66: Reconcile with jb-release

* commit '692b0d6601761e7b1c1f8cb9581358d77551d4dd':

5 years agoReconcile with jb-release
The Android Open Source Project [Fri, 29 Jun 2012 15:14:09 +0000 (08:14 -0700)]
Reconcile with jb-release

Change-Id: I4deb64bb027bc5216883f21f97502ae54c97fd39

5 years agoMerge "Put back old ion library"
Rebecca Schultz Zavin [Thu, 28 Jun 2012 22:25:01 +0000 (15:25 -0700)]
Merge "Put back old ion library"

5 years agoPut back old ion library
Rebecca Schultz Zavin [Thu, 28 Jun 2012 22:08:22 +0000 (15:08 -0700)]
Put back old ion library

Non-backwards compatible changes are being made to the version in system core

Change-Id: I66d5119fb28a7eb3dc6cb9f7cbd1a8a8d902f290
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
5 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 26 Jun 2012 18:10:47 +0000 (11:10 -0700)]
merge in jb-release history after reset to jb-dev

5 years agoam 35e328cb: am 812f0cdd: fix full_maguro-userdebug build
Keun young Park [Tue, 26 Jun 2012 03:43:07 +0000 (20:43 -0700)]
am 35e328cb: am 812f0cdd: fix full_maguro-userdebug build

* commit '35e328cb5be78e7823198e5a236e0d4dd36ef920':
  fix full_maguro-userdebug build

5 years agoam 812f0cdd: fix full_maguro-userdebug build
Keun young Park [Tue, 26 Jun 2012 03:40:24 +0000 (20:40 -0700)]
am 812f0cdd: fix full_maguro-userdebug build

* commit '812f0cdd21be16f695df67670fb3370087400f8b':
  fix full_maguro-userdebug build

5 years agofix full_maguro-userdebug build
Keun young Park [Mon, 25 Jun 2012 23:52:53 +0000 (16:52 -0700)]
fix full_maguro-userdebug build

- add libcutils and libcrypto to library list

Change-Id: Ic395785b2e0bf2af137ba53f4682d1d184ac53ea

5 years agoam b9bf3ee0: Reconcile with jb-release
The Android Open Source Project [Thu, 24 May 2012 16:03:51 +0000 (09:03 -0700)]
am b9bf3ee0: Reconcile with jb-release

* commit 'b9bf3ee004e70555219cd40b64e8eb1bcbf00df0':

5 years agoReconcile with jb-release
The Android Open Source Project [Thu, 24 May 2012 16:01:20 +0000 (09:01 -0700)]
Reconcile with jb-release

Change-Id: I8b082311ec344c83c7483b92e1066799b0d14986

5 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 24 May 2012 14:00:23 +0000 (07:00 -0700)]
merge in jb-release history after reset to jb-dev

5 years agoam ca48276c: am c78626b1: CameraHal: Avoids possible race conditions while accessing...
Emilian Peev [Thu, 24 May 2012 01:50:05 +0000 (18:50 -0700)]
am ca48276c: am c78626b1: CameraHal: Avoids possible race conditions while accessing \'mParams\'

* commit 'ca48276c03af29e1e7f221f96bd2699cd4fa13c3':
  CameraHal: Avoids possible race conditions while accessing 'mParams'

5 years agoam c78626b1: CameraHal: Avoids possible race conditions while accessing \'mParams\'
Emilian Peev [Thu, 24 May 2012 01:47:39 +0000 (18:47 -0700)]
am c78626b1: CameraHal: Avoids possible race conditions while accessing \'mParams\'

* commit 'c78626b15e9f29a5bcf85447ceafb17dcbf58b69':
  CameraHal: Avoids possible race conditions while accessing 'mParams'

5 years agoCameraHal: Avoids possible race conditions while accessing 'mParams'
Emilian Peev [Mon, 21 May 2012 09:38:23 +0000 (12:38 +0300)]
CameraHal: Avoids possible race conditions while accessing 'mParams'

- Direct access of 'mParams' outside of 'get-/setParameters()' should
  be avoided. The underlying strings can get invalidated with each
  call to 'setParameters()', which can lead to instabilities.
- This change also removes legacy stereo code, which is not used
  any more.

Bug: 6509329

Change-Id: Ief6df206c33fbdc666644cea8630e0bce6a36c00
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
5 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 23 May 2012 14:02:54 +0000 (07:02 -0700)]
merge in jb-release history after reset to jb-dev

5 years agoam 94d807c4: am 8fa731dd: Don\'t include widevine proprietary for panda.
Jean-Baptiste Queru [Tue, 22 May 2012 21:39:57 +0000 (14:39 -0700)]
am 94d807c4: am 8fa731dd: Don\'t include widevine proprietary for panda.

* commit '94d807c4a2c6d0a8212669a3ca4f5d8a97e8dc04':
  Don't include widevine proprietary for panda.

5 years agoam 8fa731dd: Don\'t include widevine proprietary for panda.
Jean-Baptiste Queru [Tue, 22 May 2012 21:36:01 +0000 (14:36 -0700)]
am 8fa731dd: Don\'t include widevine proprietary for panda.

* commit '8fa731ddc4e629880eda7f1f69de4fc4556cb7cb':
  Don't include widevine proprietary for panda.

5 years agoam d6204cf0: Reconcile with jb-release
The Android Open Source Project [Tue, 22 May 2012 21:21:15 +0000 (14:21 -0700)]
am d6204cf0: Reconcile with jb-release

* commit 'd6204cf0bc6fddb04031510cca3cb44b2b4a6d4e':

5 years agoReconcile with jb-release
The Android Open Source Project [Tue, 22 May 2012 20:06:37 +0000 (13:06 -0700)]
Reconcile with jb-release

Change-Id: I99645be9bd73a07efdbb60669775c6f38887dded

5 years agoDon't include widevine proprietary for panda.
Jean-Baptiste Queru [Tue, 22 May 2012 18:10:04 +0000 (11:10 -0700)]
Don't include widevine proprietary for panda.

There's no DRM support on panda.

Bug: 6533487
Change-Id: I41c2ab72edb5b7fb1d440cb9248e5bd0bf37a0db

5 years agoRevert "hwc: Stash hdmi mode resolution in a property"
Mike J. Chen [Tue, 22 May 2012 15:40:12 +0000 (08:40 -0700)]
Revert "hwc: Stash hdmi mode resolution in a property"

This reverts commit ce768b26571c66e176fa6d10c64ded578da937d9.

This should have been marked DO NOT MERGE in ics-aah.

5 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 22 May 2012 14:05:51 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev

5 years agoam ce768b26: hwc: Stash hdmi mode resolution in a property
Mike J. Chen [Tue, 22 May 2012 02:26:45 +0000 (19:26 -0700)]
am ce768b26: hwc: Stash hdmi mode resolution in a property

* commit 'ce768b26571c66e176fa6d10c64ded578da937d9':
  hwc: Stash hdmi mode resolution in a property

5 years agohwc: Stash hdmi mode resolution in a property
Mike J. Chen [Tue, 22 May 2012 00:18:20 +0000 (17:18 -0700)]
hwc: Stash hdmi mode resolution in a property

The property can be read by apps like YouTube to choose
lower resolution videos if the hdmi mode is < 1080p.
Saves bandwidth, latency, and time wasted scaling.

Change-Id: Iab46699f4ea2208f1f9475420d57ccf1e16214df
Signed-off-by: Mike J. Chen <mjchen@google.com>
5 years agoam aca35afd: am 16b7f6c4: hwc: Fix truncation errors in scaling decision
Lajos Molnar [Mon, 21 May 2012 21:38:07 +0000 (14:38 -0700)]
am aca35afd: am 16b7f6c4: hwc: Fix truncation errors in scaling decision

* commit 'aca35afd1da95e99a3b66c8a4864f9c70b2f7e70':
  hwc: Fix truncation errors in scaling decision

5 years agoam 7a7d4c25: (-s ours) am 4495a871: Fix secondary builds (AOSP, panda) - do not merge
Jean-Baptiste Queru [Mon, 21 May 2012 21:31:13 +0000 (14:31 -0700)]
am 7a7d4c25: (-s ours) am 4495a871: Fix secondary builds (AOSP, panda) - do not merge

* commit '7a7d4c25c7362c011397219180c9b7e9afa9ce9c':
  Fix secondary builds (AOSP, panda) - do not merge

5 years agoam 16b7f6c4: hwc: Fix truncation errors in scaling decision
Lajos Molnar [Mon, 21 May 2012 21:30:02 +0000 (14:30 -0700)]
am 16b7f6c4: hwc: Fix truncation errors in scaling decision

* commit '16b7f6c4b06ac7350c30309d0559a466097d8ae7':
  hwc: Fix truncation errors in scaling decision

5 years agohwc: Fix truncation errors in scaling decision
Lajos Molnar [Mon, 7 May 2012 21:42:31 +0000 (16:42 -0500)]
hwc: Fix truncation errors in scaling decision

When checking if we are downscaling beyond what the hardware
supports, we were dividing by the factors rather than multiplying
the other side with them.  The truncation of the divisions had
hwc allowing downscaling by a factor slightly larger than what
was supported.

Change-Id: I6ae4d897f4afe68ae26f0d7385e4003d6f2a4253
Signed-off-by: Lajos Molnar <lajos@ti.com>
5 years agoam 4495a871: Fix secondary builds (AOSP, panda) - do not merge
Jean-Baptiste Queru [Mon, 21 May 2012 15:55:50 +0000 (08:55 -0700)]
am 4495a871: Fix secondary builds (AOSP, panda) - do not merge

* commit '4495a87138cd1f0fdf62a9c4649e2c2bdbd3527d':
  Fix secondary builds (AOSP, panda) - do not merge

5 years agoFix secondary builds (AOSP, panda) - do not merge
Jean-Baptiste Queru [Thu, 3 May 2012 01:02:39 +0000 (18:02 -0700)]
Fix secondary builds (AOSP, panda) - do not merge

liboemcrypto only exists in vendor/ builds
BOARD_USES_SECURE_SERVICES isn't set in all builds

Bug: 6521860
Change-Id: Ied82b1f8dc177feb710e8d9b0abd42fbfac4d9f9

5 years agoam 97160be1: (-s ours) DO NOT MERGE
Mike J. Chen [Thu, 17 May 2012 19:40:24 +0000 (12:40 -0700)]
am 97160be1: (-s ours) DO NOT MERGE

* commit '97160be189cd52b5cb8eecf97fd47ed034b54f5c':
  DO NOT MERGE

5 years agoDO NOT MERGE
Mike J. Chen [Thu, 17 May 2012 19:07:16 +0000 (12:07 -0700)]
DO NOT MERGE

This reverts commit c6c812aba62cf44f7f83c402cdc3318108a207ed.

We're not going to support < 1080p without scaling after all.
It was deemed too hard to correct the DPI issues and the
number of users with 720p monitors is too small (about 15%).

Signed-off-by: Mike J. Chen <mjchen@google.com>
5 years agoam c6c812ab: (-s ours) DO NOT MERGE:
Mike J. Chen [Wed, 16 May 2012 17:21:54 +0000 (10:21 -0700)]
am c6c812ab: (-s ours) DO NOT MERGE:

* commit 'c6c812aba62cf44f7f83c402cdc3318108a207ed':
  DO NOT MERGE:

5 years agoam fc8f4796: (-s ours) DO NOT MERGE
Dandawate Saket [Wed, 16 May 2012 17:19:39 +0000 (10:19 -0700)]
am fc8f4796: (-s ours) DO NOT MERGE

* commit 'fc8f4796e2893e4e0d6b9051fa7a37ecf522f0b8':
  DO NOT MERGE

5 years agoDO NOT MERGE:
Mike J. Chen [Tue, 15 May 2012 01:55:35 +0000 (18:55 -0700)]
DO NOT MERGE:

OMAP4: HWC: Don't scale on non-1080p monitors

Instead, we're going to use WindowManager's setForcedDisplaySize()
API to have the apps draw to windows that are a subregion of the
framebuffer and only show that on the HDMI output.

We set a property when the mode is set so that Java code elsewhere
(going into TungstenLEDService in a separate CL) can read it
and pass it on to the WindowManager.

This reverts a bunch of the scaling code that was introduced
in Saket's change:

8e8bf69d94423df082460c43d818e58046b2d1de

Change-Id: Ic6b12c5552bc75aee762ee71dd786d17da1f911f
Signed-off-by: Mike J. Chen <mjchen@google.com>
5 years agoam fff80172: Reconcile with jb-release nakasi-factoryrom-release
The Android Open Source Project [Wed, 16 May 2012 15:45:24 +0000 (08:45 -0700)]
am fff80172: Reconcile with jb-release nakasi-factoryrom-release

* commit 'fff80172cafb42a06fa952a7412faaabe648f7c3':

5 years agoReconcile with jb-release nakasi-factoryrom-release
The Android Open Source Project [Wed, 16 May 2012 15:40:50 +0000 (08:40 -0700)]
Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I390214bd97cf63ec6bbf211b281eeb34f53b4a5e

5 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 14 May 2012 14:03:51 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev

5 years agoam d822531f: CameraHAL: Aligns UV planes during YV12 preview callbacks
Emilian Peev [Thu, 10 May 2012 18:58:04 +0000 (11:58 -0700)]
am d822531f: CameraHAL: Aligns UV planes during YV12 preview callbacks

* commit 'd822531f1f2b4c0fea1cd971d28bd1e552ed67ba':
  CameraHAL: Aligns UV planes during YV12 preview callbacks

5 years agoam 1e67b5ff: CameraHal: Remove lock queries from \'mParams\' during \'getParameters()\'
Emilian Peev [Thu, 10 May 2012 18:54:59 +0000 (11:54 -0700)]
am 1e67b5ff: CameraHal: Remove lock queries from \'mParams\' during \'getParameters()\'

* commit '1e67b5ff2e8016d506cb29900b476435f03cb3a3':
  CameraHal: Remove lock queries from 'mParams' during 'getParameters()'

5 years agoCameraHAL: Aligns UV planes during YV12 preview callbacks
Emilian Peev [Tue, 8 May 2012 09:47:30 +0000 (12:47 +0300)]
CameraHAL: Aligns UV planes during YV12 preview callbacks

- UV planes stride should be multiple of 16. The buffer
  size should also be updated accordingly.

Bug: 6447707

Change-Id: If436801fbb2750523a3207878f611c8094667367
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
5 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 10 May 2012 14:03:49 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev

5 years agoam baed3f89: CameraHal: Add support for YUY2 preview callbacks
Emilian Peev [Tue, 8 May 2012 18:32:59 +0000 (11:32 -0700)]
am baed3f89: CameraHal: Add support for YUY2 preview callbacks

* commit 'baed3f89bba1cbd3720656f7125f25705be38db7':
  CameraHal: Add support for YUY2 preview callbacks

5 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 8 May 2012 15:20:58 +0000 (08:20 -0700)]
merge in jb-release history after reset to jb-dev

5 years agoCameraHal: Remove lock queries from 'mParams' during 'getParameters()'
Emilian Peev [Fri, 6 Apr 2012 14:35:47 +0000 (17:35 +0300)]
CameraHal: Remove lock queries from 'mParams' during 'getParameters()'

- A race condition with 'set3ALock()' is possible, which
  can lead to a segfault during calls to 'getParameters()'.

Bug: 6255665

Change-Id: Id64cf3ccfa1e47501d7ba0fb892f2f72329a2ad6
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
5 years agoCameraHal: Add support for YUY2 preview callbacks
Emilian Peev [Wed, 2 May 2012 09:18:12 +0000 (12:18 +0300)]
CameraHal: Add support for YUY2 preview callbacks

- The currently used Gralloc buffers for preview
  are limited to only NV12 pixelformat. In order
  to support this type of preview callbacks,
  CameraHal will internally convert from NV12 to
  YUY2.

Bug: 6419136

Change-Id: I879e32d4b2142bdd0a1f89fe7c5496d250039b73
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
5 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 7 May 2012 14:03:00 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev

5 years agoam d8bf3dc0: CameraHal: Do full AF sweep during lost AF status
Emilian Peev [Mon, 7 May 2012 10:47:27 +0000 (03:47 -0700)]
am d8bf3dc0: CameraHal: Do full AF sweep during lost AF status

* commit 'd8bf3dc07ef357eb0761cfdacab458f2358907aa':
  CameraHal: Do full AF sweep during lost AF status

5 years agoDO NOT MERGE
Dandawate Saket [Wed, 25 Apr 2012 12:05:58 +0000 (17:35 +0530)]
DO NOT MERGE

OMAP4: HWC : Fix overlay assignement issue

It was found that when there are more than
4 layers overlay 3 was gettig multiple assignements.
This was causing the mouse pointer layer not to show
on the screen.

Change-Id: I422b772ed78f83db31f31060664b21ec31105642
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Signed-off-by: Muralidhar Dixit <murali@ti.com>
5 years agoCameraHal: Do full AF sweep during lost AF status
Emilian Peev [Wed, 2 May 2012 12:04:50 +0000 (15:04 +0300)]
CameraHal: Do full AF sweep during lost AF status

- Previously only "OMX_FocusStatusUnableToReach" status
  was activating the full AF scan. Currently with CAF
  callbacks updates in Ducati, this is no longer the case
  and "OMX_FocusStatusLost" should be considered as well.

Bug: 6378194

Change-Id: Ib296c6d7197cd275a9e5106f791451f4179be3e9
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
5 years agoliboemcrypto only exists in vendor/ builds
Jean-Baptiste Queru [Thu, 3 May 2012 01:02:39 +0000 (18:02 -0700)]
liboemcrypto only exists in vendor/ builds

Change-Id: Ied82b1f8dc177feb710e8d9b0abd42fbfac4d9f9

5 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 2 May 2012 14:06:11 +0000 (07:06 -0700)]
merge in jb-release history after reset to jb-dev

5 years agoPart of fix for build break - missing WVCryptoPlugin.h in full_tuna build
Jeff Tinker [Tue, 1 May 2012 23:16:41 +0000 (16:16 -0700)]
Part of fix for build break - missing WVCryptoPlugin.h in full_tuna build

Change-Id: Ie09e2916660766c2b69aa972e7b2a17d728b0b53

related-to-bug: 6427841

5 years agoMerge "Build libdrmdecrypt by linking against new wv static library." into jb-dev
Jeff Tinker [Tue, 1 May 2012 22:14:05 +0000 (15:14 -0700)]
Merge "Build libdrmdecrypt by linking against new wv static library." into jb-dev

5 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 1 May 2012 14:03:36 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev

5 years agoMerge "Renaming AAC variants to their more technical forms." into jb-dev
Dave Burke [Mon, 30 Apr 2012 19:45:40 +0000 (12:45 -0700)]
Merge "Renaming AAC variants to their more technical forms." into jb-dev

5 years agoRenaming AAC variants to their more technical forms.
Dave Burke [Mon, 30 Apr 2012 04:15:28 +0000 (21:15 -0700)]
Renaming AAC variants to their more technical forms.

Bug: 6275957

Change-Id: I3a01cc670b19b2be1ccd5a7196b5c3489d87d11d

5 years agoCameraHal: Fix for YV12 camera callbacks
Emilian Peev [Mon, 23 Apr 2012 09:21:57 +0000 (12:21 +0300)]
CameraHal: Fix for YV12 camera callbacks

- 'mPreviewPixelFormat' was being set incorrectly
  for YV12 case.

Bug: 6325348

Change-Id: I80acc5cd721d317fac9525bdb734fe2e70df85bf
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
5 years agoBuild libdrmdecrypt by linking against new wv static library.
Andreas Huber [Mon, 16 Apr 2012 21:43:00 +0000 (14:43 -0700)]
Build libdrmdecrypt by linking against new wv static library.

related-to-bug: 5986621

Change-Id: I3776726b13bb3cc66ebd6d64248ba792110be983

5 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 23 Apr 2012 14:04:32 +0000 (07:04 -0700)]
merge in jb-release history after reset to master

5 years agoam eafa266c: (-s ours) DO NOT MERGE
Travis Geiselbrecht [Fri, 20 Apr 2012 18:45:55 +0000 (11:45 -0700)]
am eafa266c: (-s ours) DO NOT MERGE

* commit 'eafa266c88c496aa539f46407fbdab137b86d2c7':
  DO NOT MERGE

5 years agoDO NOT MERGE
Travis Geiselbrecht [Thu, 19 Apr 2012 23:26:17 +0000 (16:26 -0700)]
DO NOT MERGE

HWC: OMAP4: disable the first frame display reset

A hack to reset the display on the first frame was put in previously
to allow for a seamless transition between the boot logo from
the bootloader to the boot animation.

In our case, the kernel/hwc has already scanned and set the proper
hdmi mode, so we dont want to bounce the panel.

Change-Id: I35a04e1cc25504685bdb71b03cee29b9c0fce1d7

5 years agoMerge "WORKAROUND for Bug:5965421"
Mathias Agopian [Fri, 20 Apr 2012 00:18:01 +0000 (17:18 -0700)]
Merge "WORKAROUND for Bug:5965421"

5 years agomerge in jb-release history after reset to master
The Android Automerger [Thu, 19 Apr 2012 14:03:37 +0000 (07:03 -0700)]
merge in jb-release history after reset to master

5 years agoRevert "Use new camera connect api."
Wu-cheng Li [Thu, 19 Apr 2012 04:36:39 +0000 (12:36 +0800)]
Revert "Use new camera connect api."

This reverts commit ab9ef43721796d6ee4b35ab4614be0210a189fe4.

5 years agoWORKAROUND for Bug:5965421
Mathias Agopian [Wed, 18 Apr 2012 23:36:27 +0000 (16:36 -0700)]
WORKAROUND for Bug:5965421

looks like certain scaling factor cause the overlay engine to go all black.
Limit the vertical downsampling to 4x instead of 8x

Change-Id: I9034fb99b64c6936059970553b24eba5c941ebdd

5 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 16 Apr 2012 14:03:53 +0000 (07:03 -0700)]
merge in jb-release history after reset to master

5 years agoam c6336459: (-s ours) DO NOT MERGE
Travis Geiselbrecht [Fri, 13 Apr 2012 16:29:52 +0000 (09:29 -0700)]
am c6336459: (-s ours) DO NOT MERGE

* commit 'c63364590d5df4837438ba69b4ba7dad66af3321':
  DO NOT MERGE

5 years agoDO NOT MERGE
Travis Geiselbrecht [Thu, 12 Apr 2012 21:53:30 +0000 (14:53 -0700)]
DO NOT MERGE

HDMI: update mode selection logic

The kernel now passes all of the modes to user space with flags
to specify whether or not it is preferred or not and if the
hardware actually supports the mode. With this, we can try to
pick modes that match the 'preferred' mode as specified in the EDID
from the panel.

If the preferred mode is masked due to the driver, the logic will
try to favor available modes that match the resolution of the preferred
mode. If none of these options are available, fall back to the
older logic of trying to find the best mode to match what the
current framebuffer is set to.

Change-Id: I289fd36ee5b8151739942832d9ff3fd876e8d3ee

5 years agoMerge "hwc: add handling for new style vsync events"
Erik Gilling [Thu, 12 Apr 2012 22:47:51 +0000 (15:47 -0700)]
Merge "hwc: add handling for new style vsync events"

5 years agoam e22bec1a: (-s ours) DO NOT MERGE
Travis Geiselbrecht [Thu, 12 Apr 2012 20:55:58 +0000 (13:55 -0700)]
am e22bec1a: (-s ours) DO NOT MERGE

* commit 'e22bec1a7e61fd1d0355587305c3233e5a44508b':
  DO NOT MERGE

5 years agoDO NOT MERGE
Travis Geiselbrecht [Thu, 12 Apr 2012 18:58:26 +0000 (11:58 -0700)]
DO NOT MERGE

Squelch a particular log message about assigning a z-layer to the fb:

"**** should have assigned z-layer for fb"

Should find the real reason behind it, but for now it's filling up
the system logs.

Change-Id: Ied57563c706fcc358663e99b9186a8c9c13a2da5

5 years agohwc: add handling for new style vsync events
Erik Gilling [Wed, 11 Apr 2012 19:23:24 +0000 (12:23 -0700)]
hwc: add handling for new style vsync events

Change-Id: Ia435c57e0938826206010a3bdb58bcefe4201405