drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,975 Commits 1 Branch 0 Tags
Commit Graph

2162 Commits

Author SHA1 Message Date
Mathias Agopian
5137711109 am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit 'afffa8fa9f82a7343e1158bf921931fd3e3df615':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-15 14:13:04 -07:00
Mathias Agopian
9ee3975883 am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gcc 
* commit 'a9007fbdae6671f66535da4b9dad04b19aaf9186':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-14 13:30:34 -07:00
Mathias Agopian
69b4587bfb DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Iff6d9ab3a7caf58f65fc3f60633a3bd577b7af25
 2011-06-14 12:05:42 -07:00
Mathias Agopian
f0b517d9d2 Merge "may fix build on some version of gcc" 2011-06-14 11:51:24 -07:00
Mathias Agopian
f1df0407c6 may fix build on some version of gcc 
Change-Id: Ia88787c0432ec84d51fe505fd6a2b6f98ebe8f33
 2011-06-14 11:50:22 -07:00
tedbo
114420f531 Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink." 2011-06-14 11:18:30 -07:00
Dima Zavin
922261deab Merge "audio: update for audio/audio_policy header names/locations" 2011-06-13 19:43:59 -07:00
James Dong
decbe327d1 Merge "Add B frame support for MPEG4Writer" 2011-06-13 18:47:03 -07:00
Mathias Agopian
eb99f0d9f0 fix RefBase so it retains binary-compatibility with gingerbread 
Bug: 4595257
Change-Id: I0d5e10f497e3f39868bff58f6ded510c38b44b12
 2011-06-13 18:39:45 -07:00
Dima Zavin
290029d19a audio: update for audio/audio_policy header names/locations 
Change-Id: I36c49352eee57559403cd1597f56a8485a360289
Signed-off-by: Dima Zavin <dima@android.com>
 2011-06-13 18:16:26 -07:00
James Dong
4108b1edc6 Add B frame support for MPEG4Writer 
o requires the support of negative ctts duration values (ctts version 1)

Change-Id: Ib14130c9359c3bff3c76f20a7380d468a065dcaf
 2011-06-13 17:06:29 -07:00
Mathias Agopian
7bb843ca07 unify SurfaceTexture and Surface 
Add the concept of synchronous dequeueBuffer in SurfaceTexture
Implement {Surface|SurfaceTextureClient}::setSwapInterval()
Add SurfaceTexture logging
fix onFrameAvailable
 2011-06-13 15:51:35 -07:00
tedbo
cc5278a3e2 Support for setting a ParcelSurfaceTexture as the MediaPlayer sink. 
This adds support for setting a SurfaceTexture as the MediaPlayer video
sink by using a ParcelSurfaceTexture object. The goal is to enable a
SurfaceTexture to pass through Binder (via ParcelSurfaceTexture) and then
be set on the MediaPlayer.

Change-Id: Ife5689ce673eb4bee1c377019db761685217b71d
 2011-06-13 14:27:39 -07:00
Mathias Agopian
c031afc8e9 am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit '77079399fca3e9c71e2ac06f3da26934e1c278b9':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-13 14:15:00 -07:00
Mathias Agopian
afffa8fa9f fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I4773cf4fe59b2509db0ed733739eb6961d473b25
 2011-06-13 13:58:34 -07:00
Mathias Agopian
a9c9a4baf2 fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
 2011-06-13 13:44:28 -07:00
Jamie Gennis
dfc7958a2e Merge "libutils: add a binary blob cache implementation." 2011-06-13 12:32:46 -07:00
Jamie Gennis
bd3e537980 Merge changes I56779420,I044e44e1,Ic5adfa29,Ied541ab8 
* changes:
  SurfaceTexture: add some GL->GL tests.
  SurfaceTexture: fix up a comment.
  SurfaceTexture: add getTransformMatrix tests.
  SurfaceTexture: fix a getTransformMatrix crash.
 2011-06-13 11:14:57 -07:00
Jamie Gennis
4e03d327d6 SurfaceTexture: fix up a comment. 
Change-Id: I044e44e17319e08af657a7ec9fa39100876fe862
 2011-06-13 10:50:13 -07:00
Jamie Gennis
eadfb673e7 SurfaceTexture: fix a getTransformMatrix crash. 
This change moves the computation of the transform matrix out of
getTransformMatrix and instead performs the computation when
updateTexImage gets called.  This is needed in order for
getTransformMatrix to succeed even if the buffers have been freed (e.g.
by changing the buffer count) because the computation depends upon the
properties of the current GraphicBuffer.

Change-Id: Ied541ab8747b7ad604f862717135f9a16a816be9
Bug: 4490420
 2011-06-13 10:50:12 -07:00
Glenn Kasten
041120754a Merge "Remove redundant memory barrier" 2011-06-13 10:30:29 -07:00
Glenn Kasten
9dbd7d8189 Remove redundant memory barrier 
pthread_create already includes the necessary memory barriers:
 - parent at pthread_create : pthread_mutex_unlock(start_mutex)
 - child at __thread_entry : pthread_mutex_lock(start_mutex)

Add lock around uses of mThread.

Added comments:
 - uses of mThread require lock
 - androidCreateRawThreadEtc returned ID is not safe for direct use from non-parent threads.

Change-Id: I18cb296b41ddaf64cf127b57aab31154319b5970
 2011-06-10 17:07:46 -07:00
Dianne Hackborn
6b592723c9 resolved conflicts for merge of f51ded0f to master 
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
 2011-06-10 12:45:36 -07:00
Jamie Gennis
4532c5e49c Merge "Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder." 2011-06-10 10:05:04 -07:00
Dianne Hackborn
f51ded0f8f am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:06:07 -07:00
Dianne Hackborn
426431adcc Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -07:00
tedbo
050316184b Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder. 
This adds a new ParcelSurfaceTexture.java class that can be instantiated with
a SurfaceTexture and used to send the corresponding ISurfaceTexture interface
to another process via Binder. The ParcelSurfaceTexture java object can then
be used to create an ANativeWindow based on the SurfaceTextureClient interface.

Change-Id: Ie38ea948b866e52f36a6d0f6cde19b54a8546817
 2011-06-09 11:59:23 -07:00
Andreas Huber
fddf5d9f48 Make dumpsys(media.player) more useful by having AwesomePlayer populate it. 
Change-Id: I12ba7d542331a8293d67a0d47378b8be4f777759
 2011-06-08 16:04:26 -07:00
Jeff Brown
72c7362080 am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 
* commit '61220e880ac4d9d76b7fd50744439e68e929c697':
  Revert velocity damping. Bug: 4364920
 2011-06-07 17:52:30 -07:00
Wu-cheng Li
a4a48a484f Merge "Improve android.hardware.Camera.Area javadoc." 2011-06-07 04:05:35 -07:00
Wu-cheng Li
bde61a5731 Improve android.hardware.Camera.Area javadoc. 
bug:4553469
Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
 2011-06-07 19:00:03 +08:00
Jeff Brown
61220e880a am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 
* commit 'bbbab26ebe9bc789ba9abac757895a6c31de7cc5':
  Revert velocity damping. Bug: 4364920
 2011-06-06 20:36:49 -07:00
Jeff Brown
2c1804998b Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 2011-06-06 20:32:18 -07:00
Jeff Brown
ac55c2b1ea Revert velocity damping. 
Bug: 4364920

Velocity damping proved to be a bad idea because it would
cause a significant ramp in velocity at the beginning of
a gesture, instead of the desired smooth behavior.  Oh well.

Change-Id: Ie631946f47ef2492bd71fbed1ab44bbb39a875a8
 2011-06-06 20:23:54 -07:00
Iliyan Malchev
219451363d CameraParameters: add PIXEL_FORMAT_RGBA8888 
Change-Id: I2780e936f5b4628d506ac4e6947b78ef831fbde8
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2011-06-06 18:04:17 -07:00
Mathias Agopian
24855c0917 merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
Fix a race that could cause GL commands to be executed from the wrong thread.
  RefBase subclasses can now decide how they want to be destroyed.
  Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
  Fix a race-condtion in SurfaceFlinger that could lead to a crash.

initial cherry-pick:
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

Change-Id: I2a335e03fff219e35c18a7b0089b3a11d636576f
 2011-06-06 15:14:25 -07:00
Marco Nelissen
b2fd84ad1d resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp 
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
 2011-06-06 09:55:15 -07:00
James Dong
d4c6a5be80 Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h" 2011-06-03 17:43:20 -07:00
Jeff Brown
a742f85490 am 56503b8d: am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2 
* commit '56503b8ddfe5c82407da32e18061e725f668432d':
  Implement pointer acceleration.
 2011-06-03 15:30:33 -07:00
James Dong
38c07129c4 Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h 
Change-Id: I5cbc7246a63301fa7ff735fa3d6512e940608d2b
 2011-06-03 12:44:48 -07:00
Jeff Brown
56503b8ddf am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2 
* commit '8186a5f065fac2b82c90cd18d79cd234bc221402':
  Implement pointer acceleration.
 2011-06-02 17:33:55 -07:00
Dianne Hackborn
8a7d44e824 resolved conflicts for merge of 54cb63e2 to master 
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
 2011-06-02 16:44:52 -07:00
Dianne Hackborn
0e5e16a656 am da9837fb: am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2 
* commit 'da9837fb61c8aa53c67921682016d97655332089':
  Small fixes and cleanup of resource config handling.
 2011-06-02 16:24:12 -07:00
Jeff Brown
19c97d46fb Implement pointer acceleration. 
Bug: 4124987
Change-Id: I1f31a28f1594c55302ccabe13fe3ca6d2ff71d50
 2011-06-02 14:12:05 -07:00
James Dong
6c2cb3061d Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based" 2011-06-02 10:22:50 -07:00
James Dong
443287068b Do not call getEstimatedBandwidth if the streaming is not HTTP-based 
Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
 2011-06-02 10:13:52 -07:00
Glenn Kasten
993fccec5b Remove unnecessary level of priority indirection 
Change-Id: I942d43973c20a7ace8b0d3f78b4da97e45e996c6
 2011-06-01 16:46:29 -07:00
Glenn Kasten
e46a86fcb6 Revert "Use AudioTrack::event_type not int in callback" 
This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
 2011-06-01 15:20:35 -07:00
Glenn Kasten
2225e4b704 Use AudioTrack::event_type not int in callback 
Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
 2011-06-01 13:50:23 -07:00
Jean-Michel Trivi
d0bbdb02b2 Merge "Use channel mask instead of channel count for track creation" 2011-06-01 11:04:15 -07:00