Commit Graph

2202 Commits

Author SHA1 Message Date
Andreas Huber
0bb20d2e42 am 0eb6ef17: Merge "Support for an MPEG2 Program Stream extractor."
* commit '0eb6ef1798362d15696618debdb2478b386398c5':
  Support for an MPEG2 Program Stream extractor.
2011-10-13 10:05:33 -07:00
Andreas Huber
0eb6ef1798 Merge "Support for an MPEG2 Program Stream extractor." 2011-10-13 10:03:26 -07:00
Wu-cheng Li
cb1192f03a am 7a3ba4d7: am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0
* commit '7a3ba4d732d5ce394aab9783e4099b2e71f1903f':
  Improve camera javadoc and fix some errors.
2011-10-12 23:38:35 -07:00
Wu-cheng Li
7a3ba4d732 am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0
* commit '514a6cfb7f7085b266f457155ff63373d2dff8ee':
  Improve camera javadoc and fix some errors.
2011-10-12 23:36:14 -07:00
Wu-cheng Li
53b30912d3 Improve camera javadoc and fix some errors.
bug:5169599
Change-Id: Ic2205770753ff462135f884fee0a888ca8ec832d
2011-10-13 12:04:05 +08:00
Romain Guy
6c9e3e9eb8 am 19de9efc: Merge "Reduce the size of libhwui by 50%"
* commit '19de9efcc4b0367cd6cfde78c90d2d3b213814e9':
  Reduce the size of libhwui by 50%
2011-10-12 20:42:54 -07:00
Jamie Gennis
b001cfb4da am c2091130: am 075e4c3d: Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0
* commit 'c2091130ae1a1b37956f49d0fe81fb82413cd2dd':
  SurfaceFlinger: update orientation via transactions
2011-10-12 20:42:40 -07:00
Eino-Ville Talvala
e8d7d03d59 am ca2640b2: am 0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0
* commit 'ca2640b2ab4136eefe138baf07dcfcbaea86da17':
  Add video stabilization control to Camera parameters.
2011-10-12 20:01:08 -07:00
Romain Guy
19de9efcc4 Merge "Reduce the size of libhwui by 50%" 2011-10-12 13:50:11 -07:00
Romain Guy
7953745dd5 Reduce the size of libhwui by 50%
This change removes unnessary symbols. All symbols are hidden by
default, public APIs with exported symbols are explicitly marked
with ANDROID_API.

Change-Id: I692fde432a86c12108de1cfd1f6504919a7d5f3f
2011-10-12 13:48:51 -07:00
Jamie Gennis
075e4c3d2e Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0 2011-10-12 13:03:11 -07:00
Jeff Brown
2b60484225 am 241fe477: am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0
* commit '241fe477edba539bcc58df4410c307d9540a4233':
  Use ashmem for CursorWindows. Bug: 5332296
2011-10-12 12:37:46 -07:00
Eino-Ville Talvala
0a27359280 Merge "Add video stabilization control to Camera parameters." into ics-mr0 2011-10-12 10:37:57 -07:00
Eino-Ville Talvala
037abb8bb0 Add video stabilization control to Camera parameters.
Hardware video stabilization reduces camera shake in preview
and in recorded videos. It has no effect on still image capture.

Convenience accessor methods hidden for now.

Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
2011-10-12 10:34:10 -07:00
Jamie Gennis
e2909e121c SurfaceFlinger: update orientation via transactions
This change merges the ISurfaceComposer::setOrientation functionality
into ISurfaceComposer::setTransactionState.  It enables the window
manager to atomically update both the display orientation and the
position and size of the windows in a single transaction with
SurfaceFlinger.

Bug: 5439574
Change-Id: I18a8ccc564d7d760ef8afb2d015ccdb7a7963900
2011-10-11 13:34:01 -07:00
Jeff Brown
0cde89f5f0 Use ashmem for CursorWindows.
Bug: 5332296

The memory dealer introduces additional delays for reclaiming
the memory owned by CursorWindows because the Binder object must
be finalized.  Using ashmem instead gives CursorWindow more
direct control over the lifetime of the shared memory region.

The provider now allocates the CursorWindows and returns them
to clients with a read-only protection bit set on the ashmem
region.

Improved the encapsulation of CursorWindow.  Callers shouldn't
need to care about details like how string fields are allocated.

Removed the compile-time configuration of string and numeric
storage modes to remove some dead weight.

Change-Id: I07c2bc2a9c573d7e435dcaecd269d25ea9807acd
2011-10-11 11:03:19 -07:00
Jeff Brown
f27eeeb28b am 270928bd: Merge changes Idbfeb3cc,I03e8e2e7,Iff9eed78
* commit '270928bd4a1db1dc0d989f4e9897a81ab865e30e':
  Fix regression in CursorWindow.getString() Bug: 5332296
  Clean up CursorWindow lifetime. Bug: 5332296
  Fix regression in CursorWindow.copyStingToBuffer. Bug: 5332296
2011-10-07 15:09:29 -07:00
Jeff Brown
d0ff68da6a Fix regression in CursorWindow.copyStingToBuffer.
Bug: 5332296

Change-Id: Iff9eed786f0a8293b6156f883a66a322ddad5e99
2011-10-07 13:28:18 -07:00
Jeff Brown
bccfeacfb6 am f0a9181d: Merge "Clean up CursorWindow code. Bug: 5332296"
* commit 'f0a9181d0904cc50acf852a64be0c7279e098783':
  Clean up CursorWindow code. Bug: 5332296
2011-10-06 16:31:07 -07:00
Jeff Brown
3bc6bbc92c Clean up CursorWindow code.
Bug: 5332296

The code is functionally equivalent, but a little more efficient
and much easier to maintain.

Change-Id: I90670a13799df05831843a5137ab234929281b7c
2011-10-06 14:40:13 -07:00
Andreas Huber
f5d7ed6d74 am 50dabc5f: Merge "Set crop params to ANative Window during Initialization."
* commit '50dabc5f0efbe2c4a987579cb2ad94132ee587be':
  Set crop params to ANative Window during Initialization.
2011-10-05 10:37:55 -07:00
Lakshman Gowda
db62a245f9 Set crop params to ANative Window during Initialization.
The native_window_set_crop() is called when port reconfig event callback comes from decoder's and
crop parameters are changed from default getconfig() OMX_IndexConfigCommonOutputCrop values.
Since the default crop params are same as port reconfig crop params, the native_window_set_crop()
is not called, hence resulting in displaying the whole frame(paddedWidth x paddedHeight).
By calling native_window_set_crop() during initilaization of output port of decoder ensures
in setting up ANative window to crop region.

Change-Id: I68926464a1f5c7e6053804615c8b9bd32ea85688
Signed-off-by: Lakshman Gowda <lakshman79@ti.com>
2011-10-05 10:29:27 -07:00
Dianne Hackborn
08286c1224 am c04db7e0: Fix handling of "allow fds" state.
* commit 'c04db7e06737c5b9bae276ac462858d44002672e':
  Fix handling of "allow fds" state.
2011-10-03 21:23:02 -07:00
Dianne Hackborn
c04db7e067 Fix handling of "allow fds" state.
Didn't take into account nesting of bundles.  Boo.

Change-Id: Ic8cf21ad8d6f4938a3e105128624c9d162310d01
2011-10-03 21:09:35 -07:00
Jeff Brown
19a8c09892 am 32cec0e3: Merge "Transfer large bitmaps using ashmem. Bug: 5224703"
* commit '32cec0e36b044dfac81a1bbdee23e128bfdab545':
  Transfer large bitmaps using ashmem. Bug: 5224703
2011-10-03 18:30:03 -07:00
Jeff Brown
6579a9d6fe Transfer large bitmaps using ashmem.
Bug: 5224703

Change-Id: If385a66adf4c6179a0bb49c0e6d09a9567e23808
2011-10-03 17:28:13 -07:00
Dianne Hackborn
e08ce59a1d am 7d657e5c: Merge "Add mechanism for Parcel to not allow FDs to be written to it."
* commit '7d657e5cfacec1f0be845c86dd4336e7efde5ede':
  Add mechanism for Parcel to not allow FDs to be written to it.
2011-10-03 17:15:39 -07:00
Dianne Hackborn
9ecebbfbf7 Add mechanism for Parcel to not allow FDs to be written to it.
This is to help implement issue #5224703.

Change-Id: I026a5890495537d15b57fe61227a640aac806d46
2011-10-03 16:58:41 -07:00
Jamie Gennis
7d324f8c60 am 94309e3f: Merge "SurfaceTexture: parameterize the texture target"
* commit '94309e3fc7c3d8fe54f8edb9cf8b59ab62628ff6':
  SurfaceTexture: parameterize the texture target
2011-09-30 15:30:10 -07:00
Andreas Huber
bc55495612 Support for an MPEG2 Program Stream extractor.
Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
2011-09-30 15:26:31 -07:00
Jamie Gennis
8606fefa21 SurfaceTexture: parameterize the texture target
This change adds a hack to allow Android Browser to use a SurfaceTexture
to stream RGBA images to a GL_TEXTURE_2D texture object.

Change-Id: Idb90064d5d4b920959ef3be7451362ac5012460e
2011-09-30 14:19:41 -07:00
Andreas Huber
76cb4cf6ed am cb52d012: Merge "Gracefuly return on detecting wrong AAC format from corrupted files"
* commit 'cb52d012e910b86d3562d4cad32d66e17986e286':
  Gracefuly return on detecting wrong AAC format from corrupted files
2011-09-30 11:14:38 -07:00
Gilles-Arnaud Bleu-Laine
9a6ed36ba5 Gracefuly return on detecting wrong AAC format from corrupted files
Return BAD_VALUE error upon detection of wrongly formatted files.
The client should abort the initialization upon error detection.

The current CHECK() interrupts the configurecodec() preventing a graceful
exit.

Change-Id: Ic79313fa76a63284897df5d91635de87d06f3100
Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
2011-09-30 10:46:12 -07:00
Andreas Huber
311b8e26e3 am 781ae92f: Merge "Support AMR, G.711 and vorbis audio in ACodec and friends."
* commit '781ae92f11ff136b99acb56cc361ad662d9cb6b9':
  Support AMR, G.711 and vorbis audio in ACodec and friends.
2011-09-28 13:15:20 -07:00
Andreas Huber
3e408f39ef Support AMR, G.711 and vorbis audio in ACodec and friends.
Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
2011-09-28 12:37:36 -07:00
Jamie Gennis
bc04810c92 am feb158b3: Merge changes Ib302d79e,Ib4ee085f
* commit 'feb158b3cbd0dada89b0437c3e09699ba3f982de':
  SurfaceFlinger: set layer names on SurfaceTextures
  SurfaceTexture: add name support
2011-09-27 14:25:57 -07:00
Jamie Gennis
feb158b3cb Merge changes Ib302d79e,Ib4ee085f
* changes:
  SurfaceFlinger: set layer names on SurfaceTextures
  SurfaceTexture: add name support
2011-09-27 14:24:09 -07:00
Andreas Huber
e9ee8a90e9 am 48719dc6: Merge "Propagate error signalled by the source all the way to the output EOS notification."
* commit '48719dc6221fdfbc3cc49a21166b136577fe37b9':
  Propagate error signalled by the source all the way to the output EOS notification.
2011-09-26 11:04:49 -07:00
Andreas Huber
928baf1f54 Propagate error signalled by the source all the way to the output EOS notification.
Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7
related-to-bug: 5372901
2011-09-26 10:53:29 -07:00
Bart Sears
33940a594d am c52feae9: Merge "Revert "Transfer large bitmaps using ashmem. Bug: 5224703""
* commit 'c52feae9482e18f48ae1c8f9910d51c00e36f074':
  Revert "Transfer large bitmaps using ashmem. Bug: 5224703"
2011-09-25 14:36:18 -07:00
Bart Sears
b637717096 Revert "Transfer large bitmaps using ashmem. Bug: 5224703"
This reverts commit 56c58f66b9

This CL was causing the browser to crash when adding bookmarks, visiting the bookmarks page, and sharing pages (see bug http://b/issue?id=5369231
2011-09-25 14:30:21 -07:00
Jeff Brown
69e7be8d7c am 4113acf1: Merge "Transfer large bitmaps using ashmem. Bug: 5224703"
* commit '4113acf10a60f2e7cfbb835e50ef520df8257cb3':
  Transfer large bitmaps using ashmem. Bug: 5224703
2011-09-24 20:51:02 -07:00
Jeff Brown
56c58f66b9 Transfer large bitmaps using ashmem.
Bug: 5224703

Change-Id: Ic7481dd9f173986f085a8bbdcc59bbe9830d7a44
2011-09-23 21:20:47 -07:00
Wei Huang
68d7e0d2ab am e448f557: am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit 'e448f557f620ae30dcead7a4423059dfb7d70add':
  Update camera javadoc about AE and AWB lock.
2011-09-23 10:07:33 -07:00
Wei Huang
e448f557f6 am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
  Update camera javadoc about AE and AWB lock.
2011-09-23 10:05:22 -07:00
Jamie Gennis
44a052203e SurfaceTexture: add name support
This change adds support for setting a string that can be used to
identify a SurfaceTexture object in log messages.

Change-Id: Ib4ee085f36c8830dc964c05ef1654f5a55dfcd60
2011-09-22 17:49:10 -07:00
Wu-cheng Li
b4f95be03e Update camera javadoc about AE and AWB lock.
- Autofocus does not lock AE and AWB.
- stopPreview and takePicture do not clear AE and AWB locks.

bug:5356404

Change-Id: I55d9b35f4ff746ecd2bff112c2674f1aa2543aca
2011-09-22 18:19:02 +08:00
Jeff Brown
088663e846 am a829e166: Merge "Handle orientation changes more systematically. Bug: 4981385"
* commit 'a829e16681903e6a41901145195f88bf9d952f88':
  Handle orientation changes more systematically. Bug: 4981385
2011-09-21 21:11:37 -07:00
Jeff Brown
01a98ddbdf Handle orientation changes more systematically.
Bug: 4981385

Simplify the orientation changing code path in the
WindowManager.  Instead of the policy calling setRotation()
when the sensor determined orientation changes, it calls
updateRotation(), which figures everything out.  For the most
part, the rotation actually passed to setRotation() was
more or less ignored and just added confusion, particularly
when handling deferred orientation changes.

Ensure that 180 degree rotations are disallowed even when
the application specifies SCREEN_ORIENTATION_SENSOR_*.
These rotations are only enabled when docked upside-down for
some reason or when the application specifies
SCREEN_ORIENTATION_FULL_SENSOR.

Ensure that special modes like HDMI connected, lid switch,
dock and rotation lock all cause the sensor to be ignored
even when the application asks for sensor-based orientation
changes.  The sensor is not relevant in these modes because
some external factor (or the user) is determining the
preferred rotation.

Currently, applications can still override the preferred
rotation even when there are special modes in play that
might say otherwise.  We could tweak this so that some
special modes trump application choices completely
(resulting in a letter-boxed application, perhaps).
I tested this sort of tweak (not included in the patch)
and it seems to work fine, including transitions between
applications with varying orientation.

Delete dead code related to animFlags.

Handle pausing/resuming orientation changes more precisely.
Ensure that a deferred orientation change is performed when
a drag completes, even if endDragLw() is not called because the
drag was aborted before the drop happened.  We pause
the orientation change in register() and resume in unregister()
because those methods appear to always be called as needed.

Change-Id: If0a31de3d057251e581fdee64819f2b19e676e9a
2011-09-21 19:26:15 -07:00
Mathias Agopian
62cd6a5d63 am 44bfbbe5: Merge "fix the float Rect in OpenGLRenderer to handle NANs"
* commit '44bfbbe501880f42105c49d479d4c109af420dbf':
  fix the float Rect in OpenGLRenderer to handle NANs
2011-09-20 16:23:18 -07:00