1349 Commits

Author SHA1 Message Date
Mathias Agopian
5f98310f9a am fd89b1c8: am 7623da43: split surface management from surface\'s buffers management 2010-06-04 19:17:12 -07:00
Mathias Agopian
18fa1de510 am cfa6de70: am 593c05ce: clean-up client management. 2010-06-04 19:17:08 -07:00
Mathias Agopian
fae5cb2b35 optimize Surface.readFromParcel()
this is called for each relayout() and used to create a full Surface (cpp)
which in turn did some heavy work (including an IPC with surfaceflinger),
most of the time to destroy it immediatelly when the returned surface
(the one in the parcel) was the same.

we now more intelligentely read from the parcel and construct the new
object only if needed.

Change-Id: Idfd40d9ac96ffc6d4ae5fd99bcc0773e131e2267
2010-06-04 18:57:41 -07:00
Mathias Agopian
7623da435e split surface management from surface's buffers management
Change-Id: If3c5655d1231f8f0c49ba68f972b1b20c93b3f87
2010-06-04 18:57:41 -07:00
Mathias Agopian
593c05ce7b clean-up client management.
simplified things a lot, the biggest change is that the concept
of "ClientID" is now gone, instead we simply use references.

Change-Id: Icbc57f80865884aa5f35ad0d0a0db26f19f9f7ce
2010-06-04 18:57:40 -07:00
Alex Sakhartchouk
89ec91b64d Merge "Removing debug output." 2010-06-04 16:13:27 -07:00
Alex Sakhartchouk
422ce6b4db Removing debug output.
Change-Id: I05bd821607e3312180ed910313c88722a7c13f22
2010-06-04 16:10:12 -07:00
Konstantin Lopyrev
ddcafcbd62 Fix 1684100: Making sure that empty package, type and resource ids are not accepted.
Change-Id: I4c94877e4312e9a5b4d22c8625069ca056c62e40
2010-06-04 14:37:37 -07:00
Alex Sakhartchouk
0829f0d51f Merge "Creating the jni and java layer to integrate a3d" 2010-06-04 10:10:24 -07:00
Alex Sakhartchouk
aae74ad614 Creating the jni and java layer to integrate a3d
Change-Id: I438359633bae59bf9188cd2c4664a92ca16c5f37
2010-06-04 10:06:50 -07:00
Wu-cheng Li
baff93de27 am ab5e67c6: am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:41:44 -07:00
Wu-cheng Li
cefb01abbf Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:38:25 -07:00
Wu-cheng Li
8aba232dbc Add KEY_SUPPORTED_METERING_MODES and fix some typos.
bug:2737111
Change-Id: I108ae7057786921bf99385ad66dbc1f02d6a1448
2010-06-04 17:18:17 +08:00
Eric Laurent
4b18200b9c am 030a1553: am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:18:07 -07:00
Eric Laurent
2ea200c5a7 Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:14:46 -07:00
Wu-cheng Li
3c358eb7bd am 2f98f99c: am 5f5df382: Merge "Add camera metering mode API." into kraken 2010-06-03 22:35:40 -07:00
Wu-cheng Li
5f5df382e5 Merge "Add camera metering mode API." into kraken 2010-06-03 22:32:05 -07:00
Eric Laurent
65b65459e6 Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications.
First drop of audio framework modifications for audio effects support.

- AudioTrack/AudioRecord:
Added support for auxiliary effects in AudioTrack
Added support for audio sessions
Fixed left right channel inversion in setVolume()

- IAudioFlinger:
Added interface methods for effect enumeraiton and instantiation
Added support for audio sessions.

- IAudioTrack:
Added method to attach auxiliary effect.

- AudioFlinger
Created new classes to control effect engines in effect library and manage effect connections to tracks or
output mix:
  EffectModule: wrapper object controlling the effect engine implementation in the effect library. There
	is one EffectModule per instance of an effect in a given audio session
  EffectChain: group of effects associated to one audio session. There is one EffectChain per audio session.
	EffectChain for session 0 is for output mix effects, other chains are attached to audio tracks
	with same session ID. Each chain contains a variable number of EffectModules
  EffectHandle: implements the IEffect interface. There is one EffectHandle object for each application
	controlling (or using) an effect module. THe EffectModule maintians a list of EffectHandles.

Added support for effect modules and effect chains creation in PlaybackThread.
modified mixer thread loop to allow track volume control by effect modules and call effect processing.

-AudioMixer
Each track now specifies its output buffer used by mixer for accumulation
Modified mixer process functions to process tracks by groups of tracks with same buffer
Modified track process functions to support accumulation to auxiliary channel

Change-Id: I26d5f7c9e070a89bdd383e1a659f8b7ca150379c
2010-06-03 03:21:53 -07:00
Wu-cheng Li
f7f6333831 Add camera metering mode API.
bug:2737111
Change-Id: Ie986fee56ebeaaed2d2efb757701dfe3ffdec8d8
2010-06-03 16:34:18 +08:00
Jason Sams
b8b1e1fcfa Merge "Disabble vertex logging. bug 2734616" 2010-06-02 12:41:05 -07:00
Jason Sams
ab67fb9a80 Disabble vertex logging.
bug 2734616


Change-Id: Ibad63dfbf0f2ea3c7e475c7cf0689fd487d12be4
2010-06-02 12:40:19 -07:00
Jason Sams
be5cd38a84 Merge "Remove RS_KIND from vertex arrays types. Legacy vertex programs now bind by name just like the user programs. This removes the need for two different ways of declairing the same information." 2010-06-01 16:58:25 -07:00
Jason Sams
9e83c02917 Merge "types update." 2010-06-01 16:58:15 -07:00
Mathias Agopian
491271d3f5 am 7258fd92: am 5be7de5f: Merge "fix a bug where fading in/out of opaque 32-bits windows wasn\'t working" into kraken 2010-06-01 16:11:31 -07:00
Mathias Agopian
bd69e1b851 am 5220af87: am 770492cb: more clean-up in preparation of bigger changes 2010-06-01 16:08:48 -07:00
Mathias Agopian
a0612e41dd fix a bug where fading in/out of opaque 32-bits windows wasn't working
opaque 32-bits windows are now allocated as RGBX_8888 buffers and
SurfaceFlinger always uses GL_MODULATE instead of trying to
optimize to GL_REPLACE when possible (makes no sense on
h/w accelerated GL).

we still have a small hack for devices that don't support
RGBX_8888 in their gralloc implementation where we revert to
RGBA_8888.
2010-06-01 15:57:44 -07:00
Jason Sams
8cb39de03a Remove RS_KIND from vertex arrays types.
Legacy vertex programs now bind by name just like the user programs.
This removes the need for two different ways of declairing the same
information.

Change-Id: I0178c0962842a1bbffb6726984ae1b8f5bb7529c
2010-06-01 15:47:01 -07:00
Jason Sams
c9d0a87d50 types update.
Change-Id: I3bd43e163c919be4c3a38e0dd228cee220c62b76
2010-05-28 19:13:20 -07:00
Jason Sams
3678f1989e Merge "Rough implemetation of ForEach. Remove launchID from root graphics script." 2010-05-28 18:24:49 -07:00
Jason Sams
f17bccc905 Rough implemetation of ForEach.
Remove launchID from root graphics script.

Change-Id: I9f80c0d4df1264f2ee1624a6d7216b9dfdf8502e
2010-05-28 18:23:22 -07:00
Jason Sams
12fc0af972 Merge "Fountain update. Update field names to match legacy expectations. Cleanup java code." 2010-05-28 18:16:16 -07:00
Jason Sams
96d3749e4e Fountain update. Update field names to match legacy expectations.
Cleanup java code.

Change-Id: I1ad9ae462e46166a7b6ff2b399417dbfe50a5542
2010-05-28 18:14:41 -07:00
Mathias Agopian
770492cb2b more clean-up in preparation of bigger changes
the most important change here is the renaming of
ISurfaceFlingerClient to ISurfaceComposerClient

Change-Id: I94e18b0417f50e06f21377446639c61f65f959b3
2010-05-28 17:19:16 -07:00
Mike Lockwood
8eb25c28c0 Merge "Move CursorWindow class from core/jni to libbinder" 2010-05-28 10:24:29 -07:00
Wu-cheng Li
9222832882 am 3ed1da35: am 198975bb: Merge "Add video frame parameter." into kraken 2010-05-28 09:35:20 -07:00
Mathias Agopian
cf78921436 am 6a9d88ff: am 64ff6ab4: Merge "more clean-up of Surfaceflinger\'s client management" into kraken 2010-05-28 09:35:08 -07:00
Mike Lockwood
2807df89af Move CursorWindow class from core/jni to libbinder
To allow use of the native CursorWindow class outside of the core framework jni

Change-Id: I72e8dcb91a2c691130c33cdfd9a25d343da1c592
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-28 10:08:21 -04:00
Wu-cheng Li
198975bb01 Merge "Add video frame parameter." into kraken 2010-05-28 04:34:13 -07:00
Wu-cheng Li
d2c2929c94 Add video frame parameter.
The image format of preview frames and video frames may be different.
We need another parameter for video frame format.

bug:2720893
Change-Id: I966a31b0ce8cab25cdde65db65a18c8cbe9c7bd6
2010-05-28 17:32:41 +08:00
Mathias Agopian
c7b388c2b3 more clean-up of Surfaceflinger's client management
SurfaceComposerClient now only exist on the WindowManager side,
the client side uses the new SurfaceClient class, which only
exposes what a client needs.

also instead of keeping mappings from IBinder to SurfaceComposerClients
we have a SurfaceClient per Surface (referring to the same IBinder), this
is made possible by the fact that SurfaceClient is very light.

Change-Id: I6a1f7015424f07871632a25ed6a502c55abfcfa6
2010-05-27 19:55:43 -07:00
Mathias Agopian
9855b591dc am ec272924: am df0364de: Merge "minor clean-up GLclampx -> GLclampf" into kraken 2010-05-26 22:52:06 -07:00
Mathias Agopian
0d3c0063aa minor clean-up GLclampx -> GLclampf 2010-05-26 22:26:12 -07:00
Mathias Agopian
4e49bb9890 am ed34e950: am d908822d: Merge "clean-up dead-code" into kraken 2010-05-26 22:23:40 -07:00
Mathias Agopian
7d1508b854 clean-up dead-code 2010-05-26 22:19:19 -07:00
Mathias Agopian
2342fbdccb am 521b8d5c: am a950aa84: Merge "Make sure to use filtering while in fixed-size mode" into kraken 2010-05-26 22:14:43 -07:00
Mathias Agopian
9237703335 Make sure to use filtering while in fixed-size mode 2010-05-26 22:10:04 -07:00
Mathias Agopian
801f90bd80 am 2a0f01ea: am 7ca7eedb: Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken 2010-05-26 21:38:42 -07:00
Mathias Agopian
663baddda9 oopsie. forgot to displatch SET_BUFFERS_GEOMETRY 2010-05-26 21:31:09 -07:00
Mathias Agopian
b3ece2d595 am eaac2761: am 64f7549b: Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken 2010-05-26 11:42:51 -07:00
Mathias Agopian
2ce19af45b fix [2712278] The preview buffer left some black borders in left and bottom edges
we were incorrectly flagging push_buffer surfaces as invalid

Change-Id: I4dfd4ffbbe8a71f7e23e835db8d71966416c29bb
2010-05-25 17:51:34 -07:00