Commit Graph

15795 Commits

Author SHA1 Message Date
Eric Laurent
eafff459aa 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
Jeff Brown
afd5a633b6 Merge "Fixed some minor bugs in MotionEvent recycling." into kraken 2010-06-02 15:46:13 -07:00
Scott Main
3ee0388b81 am 105e1c5a: am 6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '105e1c5adc3da14996d659ac403e7254b81bcb76' into kraken

* commit '105e1c5adc3da14996d659ac403e7254b81bcb76':
  docs: a couple doc bug fixes
2010-06-02 13:46:53 -07:00
Scott Main
a689e8ed41 am 6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '6a297118724f31b1063b74f52295d459ec4f58dc' into froyo-plus-aosp

* commit '6a297118724f31b1063b74f52295d459ec4f58dc':
  docs: a couple doc bug fixes
2010-06-02 13:44:44 -07:00
Scott Main
e66d578d71 Merge "docs: a couple doc bug fixes" into froyo 2010-06-02 13:43:18 -07:00
The Android Open Source Project
f4a87686cc am 1bd7597b: merge from open-source master
Merge commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0' into kraken

* commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0':
  Replaced raw string arguments for Context.getSystemService() with final Context variables
2010-06-02 09:03:04 -07:00
The Android Open Source Project
0fa2fb72dc am c8763858: merge from open-source master
Merge commit 'c8763858cfcae8be89c0f88df87bf9a3ad90ae64' into kraken

* commit 'c8763858cfcae8be89c0f88df87bf9a3ad90ae64':
  Fix for issue 895 (missing android: prefix), Removed unused imports
2010-06-02 08:54:59 -07:00
The Android Open Source Project
44cb1fe3e4 merge from open-source master
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
2010-06-02 08:54:47 -07:00
The Android Open Source Project
c99c7120c3 merge from open-source master
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
2010-06-02 08:41:59 -07:00
Kenny Root
792e065b20 Merge "Improved error-handling in Rfc822Tokenizer" 2010-06-01 22:56:39 -07:00
Kenny Root
5b439d2a60 am a6703415: am 85fb2066: Amend previous ndc commit
Merge commit 'a6703415ead229d6387973c25f5b833cefd26e9b' into kraken

* commit 'a6703415ead229d6387973c25f5b833cefd26e9b':
  Amend previous ndc commit
2010-06-01 20:54:21 -07:00
Kenny Root
edcac7ba6c am 85fb2066: Amend previous ndc commit
Merge commit '85fb20665feadda526ad422c093b859e8c4d40bc' into froyo-plus-aosp

* commit '85fb20665feadda526ad422c093b859e8c4d40bc':
  Amend previous ndc commit
2010-06-01 20:52:38 -07:00
Kenny Root
ae3449f7d7 am 847b82d8: am 89bc1395: Merge "Add more error checking for ndc" into froyo
Merge commit '847b82d8a6d3cc6969cbeeaf9ca7e879abab482a' into kraken

* commit '847b82d8a6d3cc6969cbeeaf9ca7e879abab482a':
  Add more error checking for ndc
2010-06-01 19:58:32 -07:00
Kenny Root
2846041031 am 89bc1395: Merge "Add more error checking for ndc" into froyo
Merge commit '89bc1395748a0a139db82adbf01166ed6fa79766' into froyo-plus-aosp

* commit '89bc1395748a0a139db82adbf01166ed6fa79766': (392 commits)
  Add more error checking for ndc
  Add javadoc for camera scene modes.
  more clean-up in preparation of bigger changes
  Fix a typo in Singleton<>
  Avoid copying for input recording frames in CameraSource
  Add video frame parameter.
  more clean-up of Surfaceflinger's client management
  Better sniffing of MPEG4 content by checking for a compatible sub-brand.
  Remove the logic in CameraSource using CameraParameters class to find out the buffer size.
  Add support for gps altitude EXIF tags.
  minor clean-up GLclampx -> GLclampf
  clean-up dead-code
  Make sure to use filtering while in fixed-size mode
  oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
  Avoid repeatedly allocating and freeing memory in CameraSource
  After failing to create an AudioTrack, only stop the source if we were the ones starting it.
  Convert a number of assertions into runtime errors (OggExtractor)
  fix [2712278] The preview buffer left some black borders in left and bottom edges
  Fix 2667859: change text back to default size
  Support for thumbnail extraction in the Matroska extractor.
  ...
2010-06-01 19:56:42 -07:00
Kenny Root
caf742fdf5 Merge "Add more error checking for ndc" into froyo 2010-06-01 19:55:01 -07:00
Mathias Agopian
6d2f3973f6 Merge "fix a bug where fading in/out of opaque 32-bits windows wasn't working" into kraken 2010-06-01 16:00:07 -07:00
Mathias Agopian
49753266d2 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
Dirk Dougherty
f1ad0d9c74 am 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Merge commit '8799cdfb012935501e47f15f28d6a8ed90bd464d' into kraken

* commit '8799cdfb012935501e47f15f28d6a8ed90bd464d':
  Doc change: rename slide decks for sorting by year then quarter.
2010-06-01 15:46:53 -07:00
Dirk Dougherty
7c7eadeb4f am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Merge commit 'de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp

* commit 'de56c27dab020bf85187c8bcfc6842cb31006c59':
  Doc change: rename slide decks for sorting by year then quarter.
2010-06-01 15:45:24 -07:00
Dirk Dougherty
4005afd071 Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo 2010-06-01 15:44:02 -07:00
Dan Egnor
5220f48338 am 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit '1f5e847350ef1aece046666e20e7692a1651d9dc' into kraken

* commit '1f5e847350ef1aece046666e20e7692a1651d9dc':
  Comment-only change to add documentation for FileObserver
2010-06-01 14:44:35 -07:00
Dan Egnor
d691a841f6 am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit 'a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp

* commit 'a80331c4d75cb8a7122e31315bc1e2950131659c':
  Comment-only change to add documentation for FileObserver
2010-06-01 14:28:46 -07:00
Dan Egnor
f192ba713b Merge "Comment-only change to add documentation for FileObserver" into froyo 2010-06-01 14:09:20 -07:00
Dirk Dougherty
9ec89bbbf8 am bce5edaf: am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
Merge commit 'bce5edaf46e2abbfb07f3a292b1b967fab7d9ffe' into kraken

* commit 'bce5edaf46e2abbfb07f3a292b1b967fab7d9ffe':
  Doc change: updated dashboards stats.
2010-06-01 11:13:29 -07:00
Dirk Dougherty
88e4f7fb39 am 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
Merge commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c' into froyo-plus-aosp

* commit '862ad0e5242ae6ec43e8570c52e81b0953e6e76c':
  Doc change: updated dashboards stats.
2010-06-01 11:07:56 -07:00
Dirk Dougherty
2a053dc08d Merge "Doc change: updated dashboards stats." into froyo 2010-06-01 11:04:20 -07:00
Mathias Agopian
7e27f05739 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
Mathias Agopian
b8510b98b5 Fix a typo in Singleton<>
it could cause the sLock field to be emitted several times
in different compilation unit. it also prevented to
have 2 Singleton<> in the same file.
2010-05-28 15:13:30 -07:00
Christopher Tate
26acf3fa06 am 5c9d9949: am 6ee412d5: Also dump system process threads halfway through the watchdog interval
Merge commit '5c9d99496dab7a5cfe7cd37df749075ec9b4421b' into kraken

* commit '5c9d99496dab7a5cfe7cd37df749075ec9b4421b':
  Also dump system process threads halfway through the watchdog interval
2010-05-28 12:52:43 -07:00
Christopher Tate
1647a676f3 am 6ee412d5: Also dump system process threads halfway through the watchdog interval
Merge commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd' into froyo-plus-aosp

* commit '6ee412d51d8b601580cfb4b7be4f676b7ec76afd':
  Also dump system process threads halfway through the watchdog interval
2010-05-28 12:50:05 -07:00
James Dong
337eee57ba Merge "Avoid copying for input recording frames in CameraSource" into kraken 2010-05-28 10:53:09 -07:00
Wu-cheng Li
9bce74f474 Merge "Add video frame parameter." into kraken 2010-05-28 04:34:13 -07:00
Mathias Agopian
0208f2960c Merge "more clean-up of Surfaceflinger's client management" into kraken 2010-05-27 20:04:05 -07:00
Mathias Agopian
d4784a3b90 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
Kenny Root
6ea5538527 am 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
Merge commit '6cc137459a21e67765d2490529a920ccfb14e362' into kraken

* commit '6cc137459a21e67765d2490529a920ccfb14e362':
  Fix typo in EastAsianWidth javadoc
2010-05-27 12:37:28 -07:00
Dirk Dougherty
a76c33a393 am 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Merge commit '9eae957207c016db032819eadef261addf994a0d' into kraken

* commit '9eae957207c016db032819eadef261addf994a0d':
  Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
2010-05-27 12:37:22 -07:00
Kenny Root
085a308606 am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
Merge commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp

* commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641':
  Fix typo in EastAsianWidth javadoc
2010-05-27 12:35:25 -07:00
Dirk Dougherty
2c03020da7 am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Merge commit '9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp

* commit '9f95c64e66df7481b1c624c6cf29569ca384a822':
  Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
2010-05-27 12:35:18 -07:00
Kenny Root
2baa0fbad3 Merge "Fix typo in EastAsianWidth javadoc" into froyo 2010-05-27 12:04:34 -07:00
Dirk Dougherty
f007f06d61 Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo 2010-05-27 11:46:26 -07:00
Andreas Huber
7153f04882 Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken 2010-05-27 10:16:54 -07:00
Jeff Hamilton
3c27fda678 am edf228ce: am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Merge commit 'edf228ce1fc9aae9fe314229c19e80a434bb4393' into kraken

* commit 'edf228ce1fc9aae9fe314229c19e80a434bb4393':
  Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
2010-05-27 09:42:44 -07:00
Jeff Hamilton
9994e682f1 am dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Merge commit 'dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp

* commit 'dc46f6f6cc44954c23229019270b54b8912be825':
  Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
2010-05-27 09:40:23 -07:00
Jeff Hamilton
5b4069e958 Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo 2010-05-27 09:39:19 -07:00
Andreas Huber
f323def17b Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken 2010-05-27 08:57:23 -07:00
Mathias Agopian
9aaa3661ee Merge "minor clean-up GLclampx -> GLclampf" into kraken 2010-05-26 22:49:03 -07:00
Mathias Agopian
010fccb063 minor clean-up GLclampx -> GLclampf 2010-05-26 22:26:12 -07:00
Mathias Agopian
a051357406 Merge "clean-up dead-code" into kraken 2010-05-26 22:20:39 -07:00
Mathias Agopian
dc7a80f07a clean-up dead-code 2010-05-26 22:19:19 -07:00
Mathias Agopian
eaa60d313a Merge "Make sure to use filtering while in fixed-size mode" into kraken 2010-05-26 22:11:03 -07:00