replicant:hardware_ti_omap4xxx.git
4 years agoomap4.mk: Avoid building OMX hardware video decoding libs replicant-4.0
Paul Kocialkowski [Thu, 3 Jan 2013 21:02:02 +0000 (22:02 +0100)]
omap4.mk: Avoid building OMX hardware video decoding libs

Change-Id: I6c1e94fbfa53c60bb0fe04369c03753cfeebeacd
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 16 Dec 2011 20:01:36 +0000 (12:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 16 Dec 2011 04:50:04 +0000 (20:50 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 15 Dec 2011 06:14:31 +0000 (22:14 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agoUse local time in EXIF.
Angus Kong [Wed, 14 Dec 2011 12:59:26 +0000 (20:59 +0800)]
Use local time in EXIF.

UTC is only used in GPS time stamp and local time is used in other date/time field.

bug: 5757809
Change-Id: I8c728dca9db003c6a750df300d993e3615ef71c8

5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 14 Dec 2011 01:36:10 +0000 (17:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agohwc: set FB z-order when there are no hwc layers
Lajos Molnar [Tue, 13 Dec 2011 22:34:55 +0000 (16:34 -0600)]
hwc: set FB z-order when there are no hwc layers

When there are no layers passed to hwc, FB is still used, and
z-order must be set.

Change-Id: I7e45f56468b47712f7686b78ba0650943037c64a
Signed-off-by: Lajos Molnar <lajos@ti.com>
5 years agohwc: added static image support
Lajos Molnar [Fri, 9 Dec 2011 16:09:17 +0000 (10:09 -0600)]
hwc: added static image support

Display static image if connected to portrait dock and there are no
dockable layers.

Change-Id: I572cf9ef5bf66ac194c3a83920a8de3be1e6d4e4
Signed-off-by: Lajos Molnar <lajos@ti.com>
5 years agohwc: update to new addressing mode handling
Erik Gilling [Tue, 13 Dec 2011 20:32:15 +0000 (12:32 -0800)]
hwc: update to new addressing mode handling

Specify Post2 and cloned layers.
Fix potential overflow in zorder of cloned (dock) layer.

Change-Id: I534fe30e6b90415070824ceb7abff65e9b93c9ec
Signed-off-by: Lajos Molnar <lajos@ti.com>
Conflicts:

hwc/hwc.c

5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 9 Dec 2011 01:35:32 +0000 (17:35 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agohwc: add support for forced docking (in the dock)
Lajos Molnar [Thu, 8 Dec 2011 00:58:44 +0000 (18:58 -0600)]
hwc: add support for forced docking (in the dock)

If the dock switch is set high, mirroring is disabled and docking
transformation is set to 0.

Change-Id: Ief0f14874459f3ff435e6b43088f524af322524f
Signed-off-by: Lajos Molnar <lajos@ti.com>
5 years agohwc: extract HDMI mode scoring function
Lajos Molnar [Tue, 11 Oct 2011 04:29:21 +0000 (23:29 -0500)]
hwc: extract HDMI mode scoring function

Separate HDMI mode scoring function so that it is easier to
modify.

Also changed scoring function to be cumulative instead of
absolute, so that priorities of the sub-scores can be easily
changed.

Change-Id: I3f803c13c1482653b8a3fb26a47a8fefecc51b4b

5 years agohwc: refactor prepare: extract out hdmi cloning methods
Lajos Molnar [Tue, 11 Oct 2011 03:53:09 +0000 (22:53 -0500)]
hwc: refactor prepare: extract out hdmi cloning methods

Extract setting up mirroring into setup_mirroring().

Extract cloning an overlay into clone_layer().

Extract cloning an external layer into clone_external_layer(). This
also sets up the transformation for that layer.

Remove omap4_hwc_create_ext_matrix as it was nearly the same
as setup_mirroring().  Move missing functionality (VGA default) into
omap4_hwc_set_best_hdmi_mode().

Removed forced "common" cloning loop for mirroring and docking
support.  Instead implement them using the extracted functions.

Change-Id: I3d53397f6f5c98d1f1c512b7098f5a1c495dd93f

5 years agohwc: refactor prepare: separate gathering layer statistics and cloning decision
Lajos Molnar [Tue, 11 Oct 2011 01:48:11 +0000 (20:48 -0500)]
hwc: refactor prepare: separate gathering layer statistics and cloning decision

Extract logic that gathers layer statistics into gather_layer_statistics().

Extract logic that decides supported cloning configuration into
decide_supported_cloning().

Move prepare log to end of function.

Change-Id: I9bf3a5a1072b9d548da039e25739009dfb5ba06e

5 years agohwc: use LCD's pixel aspect ratio
Lajos Molnar [Fri, 7 Oct 2011 03:04:32 +0000 (22:04 -0500)]
hwc: use LCD's pixel aspect ratio

Now that LCD provides its dimension, use it instead of assuming 1:1
pixel ratio.

Change-Id: I92e90132986aed66d43165d181789efaa2369bbd
Signed-off-by: Lajos Molnar <molnar@ti.com>
5 years agohwc: minor code cleanup
Lajos Molnar [Wed, 5 Oct 2011 21:12:10 +0000 (16:12 -0500)]
hwc: minor code cleanup

Change-Id: I51434effcb688fa065bdd422a721282b05a192f4

5 years agohwc: simplify layer hint setting
Lajos Molnar [Wed, 5 Oct 2011 21:10:29 +0000 (16:10 -0500)]
hwc: simplify layer hint setting

Set HWC_CLEAR_FB hints in the main loop.

Change-Id: I9fb0e4241b9d3975422070daeef0706d954947b2

5 years agohwc: simplify color format handling
Lajos Molnar [Wed, 5 Oct 2011 21:02:24 +0000 (16:02 -0500)]
hwc: simplify color format handling

use handle instead of handle->format for most format checker methods
incorporate blending handling check into omap4_hwc_setup_layer_base

Change-Id: I336b3063c162733151f403b5c3de06699fcc3404

5 years agohwc: cleanup: fix spacing, removed dead code
Lajos Molnar [Wed, 5 Oct 2011 17:49:37 +0000 (12:49 -0500)]
hwc: cleanup: fix spacing, removed dead code

Change-Id: Ie36e79f80bc610b75361f592c6ed7a028e877cd5

5 years agohwc: cleanup: cleaned up debug messages
Lajos Molnar [Wed, 5 Oct 2011 17:44:25 +0000 (12:44 -0500)]
hwc: cleanup: cleaned up debug messages

Change-Id: Idf7a0623dd5559cc1273389a5a673b28a8be39f6

5 years agohwc: cleanup: resolve compiler warnings
Lajos Molnar [Wed, 5 Oct 2011 17:19:12 +0000 (12:19 -0500)]
hwc: cleanup: resolve compiler warnings

Removed compiler warnings

Change-Id: I5b6da58e48e526ccceada1cbe89291275b62c60f

5 years agohwc: remove name collision for DISPLAY_SETUP_DISPLAY
Lajos Molnar [Tue, 27 Sep 2011 15:58:40 +0000 (10:58 -0500)]
hwc: remove name collision for DISPLAY_SETUP_DISPLAY

This was defined both as an enum (flag) and as a define.  It is
now separated in dsscomp.h

Change-Id: I1626842b9c3b22588d0d5a48e4509e1bc353eaab
Signed-off-by: Lajos Molnar <molnar@ti.com>
5 years agohwc: Fix calculation of on_tv
Lajos Molnar [Fri, 4 Nov 2011 23:40:23 +0000 (18:40 -0500)]
hwc: Fix calculation of on_tv

We are only on TV if we are actually cloning to external display.

Change-Id: I4a6cb7a58f5a00b71cf18c0cd3927bbec0fe74a1

5 years agohwc: fix issues handling force_sgx
Lajos Molnar [Fri, 4 Nov 2011 23:12:56 +0000 (18:12 -0500)]
hwc: fix issues handling force_sgx

There were a couple of incorrect fixes to force_sgx handling that
are fixed by this patch.

1. no need to disable force_sgx if there are protected layers.
   We only need to route protected layer to DSS.

2. dockable layer must be rendered via DSS (or force_sgx must be
   disabled, although that reduces power savings) if we are in
   docking mode.  Prior fix of cloning an arbitrary layer as the
   docking layer was incorrect (as it was doing UI mirroring),
   and was calculating the layer index incorrectly.

3. forcing sgx rendering actually increases power if there is only
   one layer.

Change-Id: I121747ed06834f870e0f0793d38bf4e77f969858
Signed-off-by: Lajos Molnar <molnar@ti.com>
5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 2 Dec 2011 00:46:01 +0000 (16:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agoCameraHAL: Fixes a couple of corner cases with AF and capture DO NOT MERGE
Akwasi Boateng [Thu, 24 Nov 2011 10:35:58 +0000 (12:35 +0200)]
CameraHAL: Fixes a couple of corner cases with AF and capture DO NOT MERGE

Fixes b/5627968.

On some occasions during monkey tests, both the AF callback and the shutter
callback can be delayed just enough to encounter the OMX component in loaded
state. Usually this happens when the camera is getting closed and this scenario
should be properly handled by exiting immediately without trying to trigger any
callbacks to the client.

Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Change-Id: Ia18faf471a8e10579b09973178d73e69e782c63c

5 years agoCameraHAL: Enable LDCNSF for Video snapshot
Milen Mitkov [Wed, 12 Oct 2011 14:01:19 +0000 (17:01 +0300)]
CameraHAL: Enable LDCNSF for Video snapshot

Enables LDCNSF for Video snapshot, also adds start_offset and right_crop fields
to the JPEG encoder wrapper, because the image with LDCNSF has artifacts on top
and right.

Change-Id: I1011252e3f8068083f9d057b7763b7f79c59a75d
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
5 years agoCameraHAL: Perform focus even if CAF has failed
Milen Mitkov [Wed, 30 Nov 2011 15:01:58 +0000 (17:01 +0200)]
CameraHAL: Perform focus even if CAF has failed

Fixes b/5534973

Used to force focus if CAF has failed (before capture).  CAF's state is
'failed' even if a scene change is detected only.

Change-Id: I0878a9f862b7800b566e578efdfa62baec7e5889
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
5 years agoMerge changes I0878a9f8,I1011252e into ics-mr1
Iliyan Malchev [Wed, 30 Nov 2011 22:36:20 +0000 (14:36 -0800)]
Merge changes I0878a9f8,I1011252e into ics-mr1

* changes:
  CameraHAL: Perform focus even if CAF has failed
  CameraHAL: Enable LDCNSF for Video snapshot

5 years agoCameraHAL: Perform focus even if CAF has failed
Milen Mitkov [Wed, 30 Nov 2011 15:01:58 +0000 (17:01 +0200)]
CameraHAL: Perform focus even if CAF has failed

Fixes b/5534973

Used to force focus if CAF has failed (before capture).  CAF's state is
'failed' even if a scene change is detected only.

Change-Id: I0878a9f862b7800b566e578efdfa62baec7e5889
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
5 years agoCameraHAL: Enable LDCNSF for Video snapshot
Milen Mitkov [Wed, 12 Oct 2011 14:01:19 +0000 (17:01 +0300)]
CameraHAL: Enable LDCNSF for Video snapshot

Enables LDCNSF for Video snapshot, also adds start_offset and right_crop fields
to the JPEG encoder wrapper, because the image with LDCNSF has artifacts on top
and right.

Change-Id: I1011252e3f8068083f9d057b7763b7f79c59a75d
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 22 Nov 2011 19:56:26 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agoReconcile with ics-mr0-release
The Android Open Source Project [Fri, 18 Nov 2011 23:50:20 +0000 (15:50 -0800)]
Reconcile with ics-mr0-release

Change-Id: I6482deff173949813a856bbc3e64096d128821ca

5 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 18 Nov 2011 23:37:46 +0000 (15:37 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

5 years agoam 0bb54549: Ignore camera.flash_off system property for user build
James Dong [Fri, 18 Nov 2011 14:14:03 +0000 (06:14 -0800)]
am 0bb54549: Ignore camera.flash_off system property for user build

* commit '0bb5454945320db77ff426baf9c0c34631c373ab':
  Ignore camera.flash_off system property for user build

5 years agoIgnore camera.flash_off system property for user build
James Dong [Fri, 18 Nov 2011 06:49:55 +0000 (22:49 -0800)]
Ignore camera.flash_off system property for user build

This system property is meant for testing only and should be
ignored for user build.

Change-Id: I553b68d62f41012766d7d208451a178a733d151e
related-to-bug: 5617451

5 years agoCameraHAL: clean up logs
Iliyan Malchev [Thu, 17 Nov 2011 19:39:33 +0000 (11:39 -0800)]
CameraHAL: clean up logs

-- introduce CAMHAL_LOGI so that we don't have to dump informational messages
   as LOGE
-- convert some verbose messages to CAMHAL_LOGDB
-- convert most frequent non-error log messages to CAMHAL_LOGI

Change-Id: I8afc24aa17da2c157b7b37300a79b4cde81f87e5
Signed-off-by: Iliyan Malchev <malchev@google.com>
5 years agoCameraHAL: Do not return error if AF fails
Iliyan Malchev [Thu, 17 Nov 2011 04:18:26 +0000 (22:18 -0600)]
CameraHAL: Do not return error if AF fails

Fixes b/5612881

Some third-party apps do not handle errors thrown by the camera HAL when they
try to invoke autoFocus  while AF is in progress.

The Barcode Scanner, in particular, will quit in this case without releasing
the Camera handle, wreaking all sorts of power-management havoc.

Even though CTS does not mandate it, previous versions of Android and other
camera HAL implementations simply return success in this case.  This patch
makes this HAL conform to this behavior.

Change-Id: I758e2de7f84b61043267f052169068b64d75d0d1
Signed-off-by: Sundar Raman <sunds@ti.com>
5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 17 Nov 2011 14:46:42 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agoCameraHal: Use Different Timeout for Video Mode
Tyler Luu [Wed, 16 Nov 2011 22:05:22 +0000 (16:05 -0600)]
CameraHal: Use Different Timeout for Video Mode

Select AF timeout based on whether or not we are in
video mode.

b/5492725

Change-Id: I2fa722e6a3a7c149488ddb29ce44262914d19e38
Signed-off-by: Tyler Luu <tluu@ti.com>
5 years agoam c0cf33c9: Reconcile with ics-factoryrom-2-release
The Android Open Source Project [Wed, 16 Nov 2011 17:17:13 +0000 (09:17 -0800)]
am c0cf33c9: Reconcile with ics-factoryrom-2-release

* commit 'c0cf33c94e3f6c81d622be4062c9ba4c9c51cc4d':

5 years agoReconcile with ics-factoryrom-2-release
The Android Open Source Project [Wed, 16 Nov 2011 16:56:34 +0000 (08:56 -0800)]
Reconcile with ics-factoryrom-2-release

Change-Id: I128ef5f2a43fe5d8b190331492e8e9443ce242bf

5 years agoReconcile with ics-mr0-release
The Android Open Source Project [Wed, 16 Nov 2011 15:34:42 +0000 (07:34 -0800)]
Reconcile with ics-mr0-release

Change-Id: I32798f1a5d71b996bcf70f957e410f8b8f2c3bee

5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 16 Nov 2011 14:46:28 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 16 Nov 2011 14:27:56 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

5 years agoam 6014a8f2: When camera.flash_off is 1, disable camera flash. This is for testing...
James Dong [Wed, 16 Nov 2011 08:25:17 +0000 (00:25 -0800)]
am 6014a8f2: When camera.flash_off is 1, disable camera flash. This is for testing purpose only

* commit '6014a8f2648911e7e0f5ba9256afa1a7a9eaf526':
  When camera.flash_off is 1, disable camera flash. This is for testing purpose only

5 years agoWhen camera.flash_off is 1, disable camera flash.
James Dong [Wed, 16 Nov 2011 03:54:06 +0000 (19:54 -0800)]
When camera.flash_off is 1, disable camera flash.
This is for testing purpose only

Change-Id: Idf0a6d5d52daeb4b5ff7576d0119868bdeff40eb
related-to-bug: 5617451

5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 13 Nov 2011 14:46:58 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 11 Nov 2011 22:46:57 +0000 (14:46 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

5 years agoam cb1183d6: videosnapshot memory corruption fixes.
Akwasi Boateng [Fri, 11 Nov 2011 19:48:20 +0000 (11:48 -0800)]
am cb1183d6: videosnapshot memory corruption fixes.

* commit 'cb1183d6c3c8894fa09ad3ff7952388f6e7bec94':
  videosnapshot memory corruption fixes.

5 years agoam ac22c209: Revert "CameraHAL: Fix preview not starting after surface is abdandoned"
James Dong [Fri, 11 Nov 2011 19:48:20 +0000 (11:48 -0800)]
am ac22c209: Revert "CameraHAL: Fix preview not starting after surface is abdandoned"

* commit 'ac22c20954a8d7265f9f242e9c5ca739bcd73746':
  Revert "CameraHAL: Fix preview not starting after surface is abdandoned"

5 years agoam b8bac933: Merge "HWC: Only invalidate on idle when blending" into ics-mr0
Jamie Gennis [Fri, 11 Nov 2011 19:48:19 +0000 (11:48 -0800)]
am b8bac933: Merge "HWC: Only invalidate on idle when blending" into ics-mr0

* commit 'b8bac9331c81cd20143cf5add3d9e7832085acd5':
  HWC: Only invalidate on idle when blending

5 years agoRevert "CameraHAL: Fix preview not starting after surface is abdandoned"
James Dong [Fri, 11 Nov 2011 03:08:26 +0000 (19:08 -0800)]
Revert "CameraHAL: Fix preview not starting after surface is abdandoned"

This reverts commit cbaa66464ff86bddf40e3c8de8db44473ff27de9.

we need to revert this change since this leads to a stop ship problem where
we can only take a single picture.

5 years agoHWC: Only invalidate on idle when blending
Jamie Gennis [Wed, 9 Nov 2011 20:44:07 +0000 (12:44 -0800)]
HWC: Only invalidate on idle when blending

Change-Id: I6e07129502f59f26768895c30dcdb50b01011738

5 years agovideosnapshot memory corruption fixes.
Akwasi Boateng [Fri, 11 Nov 2011 01:14:16 +0000 (17:14 -0800)]
videosnapshot memory corruption fixes.

1. Fixes memory corruption of dst buffer in
nv21_to_yuv() convertion
2. Free malloced row_tmp buffer
3. Free params string in Appcallback

Change-Id: I2179f1158f6e72cca0f7e5c815b1cb576bfa925e
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
related-to-bug: 5601247

5 years agoRevert "CameraHAL: Fix preview not starting after surface is abdandoned"
James Dong [Fri, 11 Nov 2011 03:08:26 +0000 (19:08 -0800)]
Revert "CameraHAL: Fix preview not starting after surface is abdandoned"

This reverts commit cbaa66464ff86bddf40e3c8de8db44473ff27de9.

we need to revert this change since this leads to a stop ship problem where
we can only take a single picture.

5 years agoMerge "HWC: Only invalidate on idle when blending" into ics-mr0
Jamie Gennis [Fri, 11 Nov 2011 00:06:40 +0000 (16:06 -0800)]
Merge "HWC: Only invalidate on idle when blending" into ics-mr0

5 years agoam 50f5c8a3: CameraHal: WA for green thumbnail for video snapshot
Tyler Luu [Thu, 10 Nov 2011 21:57:10 +0000 (21:57 +0000)]
am 50f5c8a3: CameraHal: WA for green thumbnail for video snapshot

* commit '50f5c8a33223364870a21fb84eabe48c806697fd':
  CameraHal: WA for green thumbnail for video snapshot

5 years agoam cbaa6646: CameraHAL: Fix preview not starting after surface is abdandoned
Tyler Luu [Thu, 10 Nov 2011 21:57:09 +0000 (21:57 +0000)]
am cbaa6646: CameraHAL: Fix preview not starting after surface is abdandoned

* commit 'cbaa66464ff86bddf40e3c8de8db44473ff27de9':
  CameraHAL: Fix preview not starting after surface is abdandoned

5 years agoam f9df3ee5: CameraHAL: Clear events queue fix, clear command queue on exit
Sundar Raman [Thu, 10 Nov 2011 21:57:09 +0000 (21:57 +0000)]
am f9df3ee5: CameraHAL: Clear events queue fix, clear command queue on exit

* commit 'f9df3ee5cfb3c3177bcc630abf6d756e8a60254c':
  CameraHAL: Clear events queue fix, clear command queue on exit

5 years agoam 3ec18006: CameraHAL: Fixes for ANR and a setParameter issue
Sundar Raman [Thu, 10 Nov 2011 21:57:09 +0000 (21:57 +0000)]
am 3ec18006: CameraHAL: Fixes for ANR and a setParameter issue

* commit '3ec18006399d61e97382601d14aaa43ee339c8b6':
  CameraHAL: Fixes for ANR and a setParameter issue

5 years agoCameraHal: WA for green thumbnail for video snapshot
Tyler Luu [Thu, 10 Nov 2011 18:50:24 +0000 (12:50 -0600)]
CameraHal: WA for green thumbnail for video snapshot

WA for regression introduced with:
'cf0a61f135:  CameraHAL: Use Ancillary data to check for snapshot"

Video snapshot postview frames are not currently being tagged
with the ancillary data. Let this check pass through when in
video mode.

Change-Id: I9b3aacb902d15f1cd7f993f6664976299fcb0427
Signed-off-by: Tyler Luu <tluu@ti.com>
5 years agoCameraHAL: Fix preview not starting after surface is abdandoned
Tyler Luu [Wed, 9 Nov 2011 23:20:31 +0000 (17:20 -0600)]
CameraHAL: Fix preview not starting after surface is abdandoned

Fix 3/3 for b/5593964.

(I'm bundling this fix with b/5573610 because it is preview-related, though
 strictly speaking not part of b/b/5573610.  It has been with us since the
 beginning.)

If an application gets backgrounded (HOME key) without stopping
preview and releasing camera, preview would previously not restart
when application is resumed. ANativeWindowDisplayAdapter would
detect that the preview surface was abandoned and stop sending
buffers to CameraAdapter.

We were previously not doing anything when CameraService called
setPreviewWindow when a display adapter was already created. To
fix this issue, we need to send the preview window and restart
preview.

Change-Id: I36089b0046f9861897d32c50b52128a41e2de2a5
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
5 years agoCameraHAL: Clear events queue fix, clear command queue on exit
Sundar Raman [Thu, 10 Nov 2011 16:15:13 +0000 (08:15 -0800)]
CameraHAL: Clear events queue fix, clear command queue on exit

Fix 2/3 for b/5593964.

1. The events queue wasn't being cleared correctly inside
OMXCameraAdapter as some items were being removed while the
index was being formulated based on the original size
2. The command queue should be cleared before posting the EXIT
message for the OMX adapter threads so as not to process those
messages since we are exiting

Change-Id: I0a5eaceb3d1504fee05b064ebb5fe888e129ad44
Signed-off-by: Sundar Raman <sunds@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
5 years agoCameraHAL: Fixes for ANR and a setParameter issue
Sundar Raman [Tue, 8 Nov 2011 19:10:16 +0000 (11:10 -0800)]
CameraHAL: Fixes for ANR and a setParameter issue

Fix 1/3 for b/5593964.

1. Ensure we don't race with stopImageCapture when stopPreview is called
2. Signal the shutter callback correctly
3. Do not crash the media server if focus APIs and image capture returns error
   Still go ahead and perform de-init
4. Replace setParameter from CameraHAl to AppCallbackNotifier with getParameter
   when needed.

Change-Id: I2b2745827d227a8d7927ce1611a84c29129e8891
Signed-off-by: Sundar Raman <sunds@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 10 Nov 2011 14:46:49 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 10 Nov 2011 14:28:35 +0000 (06:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

5 years agoHWC: Only invalidate on idle when blending
Jamie Gennis [Wed, 9 Nov 2011 20:44:07 +0000 (12:44 -0800)]
HWC: Only invalidate on idle when blending

Change-Id: I6e07129502f59f26768895c30dcdb50b01011738

5 years agoam 2136042f: CameraHAL: Setting focus mode shouldnt start focus scanning
Milen Mitkov [Wed, 9 Nov 2011 21:03:21 +0000 (21:03 +0000)]
am 2136042f: CameraHAL: Setting focus mode shouldnt start focus scanning

* commit '2136042f80a20aeeef3ece24bab027c401426334':
  CameraHAL: Setting focus mode shouldnt start focus scanning

5 years agoam 402d1d64: DOMX: Add index AutofocusEnable
Milen Mitkov [Wed, 9 Nov 2011 21:03:21 +0000 (21:03 +0000)]
am 402d1d64: DOMX: Add index AutofocusEnable

* commit '402d1d64ae8c806fa058e88e1c0ad8a4b6f80dd0':
  DOMX: Add index AutofocusEnable

5 years agoCameraHAL: Setting focus mode shouldnt start focus scanning
Milen Mitkov [Mon, 24 Oct 2011 10:44:28 +0000 (13:44 +0300)]
CameraHAL: Setting focus mode shouldnt start focus scanning

Part of the fix for b/5591797.

Use the new index OMX_TI_IndexAutofocusEnable to control
the AF algorithm when it should start scanning.

Until now, setting the focus to almost any mode
caused (unwanted) scanning.

Also, "Infinity" focus should actually have the
ability to perform scanning.

Change-Id: Iaa0f46a17d63acdd8f43b4b2b011f68fc7506165
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
5 years agoDOMX: Add index AutofocusEnable
Milen Mitkov [Mon, 24 Oct 2011 10:43:51 +0000 (13:43 +0300)]
DOMX: Add index AutofocusEnable

Part of the fix for b/5591797.

Used to signify when AF scanning should begin

Change-Id: Ie130f308e36fc9aa76d15391c573d52da93b483a
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
5 years agoam 956c27e3: CameraHal: Apply3aSettings at start preview
Vladislav Hristov [Wed, 9 Nov 2011 19:00:25 +0000 (19:00 +0000)]
am 956c27e3: CameraHal: Apply3aSettings at start preview

* commit '956c27e300323eceafcca1ad77fc74ef837a5cbb':
  CameraHal: Apply3aSettings at start preview

5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 9 Nov 2011 18:06:10 +0000 (10:06 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agoCameraHal: Apply3aSettings at start preview
Vladislav Hristov [Tue, 8 Nov 2011 00:17:01 +0000 (16:17 -0800)]
CameraHal: Apply3aSettings at start preview

Fixes b/5515136.

Change-Id: I3b462b337f42be7ebe07642f5298f45bb1431daa
Signed-off-by: Vladislav Hristov <vhristov@mm-sol.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
5 years agoReconcile with ics-mr0-release
The Android Open Source Project [Wed, 9 Nov 2011 17:01:27 +0000 (09:01 -0800)]
Reconcile with ics-mr0-release

Change-Id: I9e251dca84086191eb30deb928db672e1b8b6113

5 years agoam 978f3598: DOMX: fix an ION handle leak
Iliyan Malchev [Wed, 9 Nov 2011 16:41:14 +0000 (16:41 +0000)]
am 978f3598: DOMX: fix an ION handle leak

* commit '978f3598fee8f7967aecde8d29bf23a7df3b0327':
  DOMX: fix an ION handle leak

5 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 9 Nov 2011 14:28:45 +0000 (06:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

5 years agoDOMX: fix an ION handle leak
Iliyan Malchev [Wed, 9 Nov 2011 01:03:19 +0000 (17:03 -0800)]
DOMX: fix an ION handle leak

This fixes an ION-handle memory leak in mediaserver that occured every time you
launch the camera.

Change-Id: I01b96f28a538d3a37f1badfa330d380b0df49d4e
Signed-off-by: Iliyan Malchev <malchev@google.com>
5 years agoReconcile with ics-mr0-release
The Android Open Source Project [Tue, 8 Nov 2011 19:09:23 +0000 (11:09 -0800)]
Reconcile with ics-mr0-release

Change-Id: Iba27b8721747eb385654bcacca3fa9520af8e26b

5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 8 Nov 2011 14:46:02 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 8 Nov 2011 14:41:11 +0000 (06:41 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

5 years agoam fe3c9139: CameraHal: Wait for frame before stopping preview
Tyler Luu [Mon, 7 Nov 2011 21:43:15 +0000 (21:43 +0000)]
am fe3c9139: CameraHal: Wait for frame before stopping preview

* commit 'fe3c9139602c77b4890370307b63e1ab9990a75b':
  CameraHal: Wait for frame before stopping preview

5 years agoam fc8ab094: CameraHal: Clean-up if mCaptureSem times out
Tyler Luu [Mon, 7 Nov 2011 21:43:15 +0000 (21:43 +0000)]
am fc8ab094: CameraHal: Clean-up if mCaptureSem times out

* commit 'fc8ab094473901857ee382396eebc5d52ac4c6c6':
  CameraHal: Clean-up if mCaptureSem times out

5 years agoam a58c483d: CameraHal: Add function to rollback state machine
Tyler Luu [Mon, 7 Nov 2011 21:43:14 +0000 (21:43 +0000)]
am a58c483d: CameraHal: Add function to rollback state machine

* commit 'a58c483de2c8188e41fd9635042c31820d13b845':
  CameraHal: Add function to rollback state machine

5 years agoCameraHal: Wait for frame before stopping preview
Tyler Luu [Wed, 26 Oct 2011 17:22:00 +0000 (12:22 -0500)]
CameraHal: Wait for frame before stopping preview

Fix 3/3 for b/5472396.

We should wait for the first frame to come before trying to
stopPreview. If not, we might put OMXCamera in a bad state
i.e (IDLE->LOADED timeout). Seeing this a lot after a capture

Change-Id: I4ac6cc4f12bdc0d4d73e065b7c53caf8a440a43c
Signed-off-by: Tyler Luu <tluu@ti.com>
5 years agoCameraHal: Clean-up if mCaptureSem times out
Tyler Luu [Wed, 26 Oct 2011 17:12:02 +0000 (12:12 -0500)]
CameraHal: Clean-up if mCaptureSem times out

Fix 2/3 for b/5472396.

In stopImageCapture, continue cleaning up even if mCaptureSem
times out.

Change-Id: Idf65a488b2ce55a9d451a899df0bc76f6480647b
Signed-off-by: Tyler Luu <tluu@ti.com>
5 years agoCameraHal: Add function to rollback state machine
Tyler Luu [Wed, 26 Oct 2011 09:44:38 +0000 (04:44 -0500)]
CameraHal: Add function to rollback state machine

Fix 1/3 for b/5472396.

Adding a function to rollback the state machine to INTITIALIZED_STATE
from any given current state. With this function, we can better
manage the different states that CameraAdapter could be in when
stopPreview is called.

Change-Id: I0a456738e8575873b5ac6fb2a31395dab54ef6f7
Signed-off-by: Tyler Luu <tluu@ti.com>
5 years agoReconcile with ics-mr0-release
The Android Open Source Project [Mon, 7 Nov 2011 16:23:30 +0000 (08:23 -0800)]
Reconcile with ics-mr0-release

Change-Id: Ibd3c0a0baba6f7d7b0eb5c78bd3243c3441e43d8

5 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 6 Nov 2011 14:46:16 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

5 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 4 Nov 2011 22:40:16 +0000 (15:40 -0700)]
merge in ics-mr0-release history after reset to ics-mr0

5 years agoam d9949c1e: CameraHal: Add 2592x1728 and 2592x1458 image capture resolutions
Gilles-Arnaud Bleu-Laine [Fri, 4 Nov 2011 19:27:42 +0000 (19:27 +0000)]
am d9949c1e: CameraHal: Add 2592x1728 and 2592x1458 image capture resolutions

* commit 'd9949c1e47698ef0e36ffadeebe642a3abe53f8b':
  CameraHal: Add 2592x1728 and 2592x1458 image capture resolutions

5 years agoReconcile with ics-factoryrom-2-release
The Android Open Source Project [Fri, 4 Nov 2011 14:57:14 +0000 (07:57 -0700)]
Reconcile with ics-factoryrom-2-release

Change-Id: I490e28e6c017f3cf35cb5d2c6577749d626fe8cf

5 years agoRevert "CameraHAL: Use Ancillary data to check for snapshot"
The Android Automerger [Thu, 3 Nov 2011 03:58:52 +0000 (20:58 -0700)]
Revert "CameraHAL: Use Ancillary data to check for snapshot"

This reverts commit cf0a61f13533d70cb7ad700330de94142c2afe6a.

5 years agoRevert "CameraHAL: Return status after CAF finishes"
The Android Automerger [Thu, 3 Nov 2011 03:58:43 +0000 (20:58 -0700)]
Revert "CameraHAL: Return status after CAF finishes"

This reverts commit 3c272a993dfc4ca153b09e5ec1e651f75eab90c4.

5 years agomerge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Thu, 3 Nov 2011 03:53:07 +0000 (20:53 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0

5 years agoCameraHal: Add 2592x1728 and 2592x1458 image capture resolutions
Gilles-Arnaud Bleu-Laine [Wed, 2 Nov 2011 08:30:22 +0000 (03:30 -0500)]
CameraHal: Add 2592x1728 and 2592x1458 image capture resolutions

Part of the fix for b/5546023

Adding new resolution to support 16:9 and 3:2 aspect ratio.

Note: This allows to keep same aspect ratio between video preview
and video snapshot.

This change requires a matching Ducati update.  For the power savings to take
effect, the new resolution must actually be used by the application.

Change-Id: I87d5f3155856b0c2c83763349843628eeadfacfc
Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
5 years agoReconcile with ics-factoryrom-2-release
The Android Open Source Project [Wed, 2 Nov 2011 17:53:23 +0000 (10:53 -0700)]
Reconcile with ics-factoryrom-2-release

Change-Id: Ic3f2b54a37b5db4a411b9f0ef622374cb6d85d97

5 years agoRevert "CameraHAL: Return status after CAF finishes"
The Android Automerger [Wed, 2 Nov 2011 17:14:05 +0000 (10:14 -0700)]
Revert "CameraHAL: Return status after CAF finishes"

This reverts commit 3c272a993dfc4ca153b09e5ec1e651f75eab90c4.

5 years agoRevert "CameraHAL: Use Ancillary data to check for snapshot"
The Android Automerger [Wed, 2 Nov 2011 17:08:37 +0000 (10:08 -0700)]
Revert "CameraHAL: Use Ancillary data to check for snapshot"

This reverts commit cf0a61f13533d70cb7ad700330de94142c2afe6a.