summaryrefslogtreecommitdiffstats
path: root/media/libeffects/data
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-04-04 18:54:36 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2012-04-09 11:27:14 -0700
commit7d5b26230a179cd7bcc01f6578cd80d8c15a92a5 (patch)
tree563086c1185e0e54770d8c60c8eec1aefdddb89f /media/libeffects/data
parent4b75a9c8b93a90749bc5d22912ad0d96c12f4ecf (diff)
downloadframeworks_av-7d5b26230a179cd7bcc01f6578cd80d8c15a92a5.zip
frameworks_av-7d5b26230a179cd7bcc01f6578cd80d8c15a92a5.tar.gz
frameworks_av-7d5b26230a179cd7bcc01f6578cd80d8c15a92a5.tar.bz2
AudioMixer uses downmix effect for multichannel content
In the AudioMixer structure associated with each track, add an object that acts as the buffer provider when the track has more than two channels of input in the mixer. This object, DownmixerBufferProvider, gets audio from the actual buffer provider of the track, and applies a downmix effect on it. The downmix effect is created and configured when the track gets created in AudioFlinger, which causes AudioMixer::getTrackName() to be called with the new track's channel mask. It is released when the track is disabled in the mixer. Change-Id: I05281ed5f61bef663a8af7ca7d5ceac3517c82db
Diffstat (limited to 'media/libeffects/data')
-rw-r--r--media/libeffects/data/audio_effects.conf7
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libeffects/data/audio_effects.conf b/media/libeffects/data/audio_effects.conf
index ce25bc8..d681c69 100644
--- a/media/libeffects/data/audio_effects.conf
+++ b/media/libeffects/data/audio_effects.conf
@@ -18,6 +18,9 @@ libraries {
pre_processing {
path /system/lib/soundfx/libaudiopreprocessing.so
}
+ downmix {
+ path /system/lib/soundfx/libdownmix.so
+ }
}
# list of effects to load. Each effect element must contain a "library" and a "uuid" element.
@@ -72,6 +75,10 @@ effects {
library visualizer
uuid d069d9e0-8329-11df-9168-0002a5d5c51b
}
+ downmix {
+ library downmix
+ uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
+ }
agc {
library pre_processing
uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b