summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/FastMixerState.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-04-12 09:39:42 -0700
committerGlenn Kasten <gkasten@google.com>2012-04-20 07:38:05 -0700
commit21e8c50bd13ebe44f3088e26c9c6df0e163c469c (patch)
tree0437226abb896de30fd20123eb3089168989391a /services/audioflinger/FastMixerState.h
parent8d6086781c79620ce6133df7bd27f0efdee6b4e6 (diff)
downloadframeworks_av-21e8c50bd13ebe44f3088e26c9c6df0e163c469c.zip
frameworks_av-21e8c50bd13ebe44f3088e26c9c6df0e163c469c.tar.gz
frameworks_av-21e8c50bd13ebe44f3088e26c9c6df0e163c469c.tar.bz2
FastMixer update
Updates: - Add support for mono fast tracks - Add support for optional sample rate conversion on fast tracks - Log sample rate and frame count - Enable statistics Change-Id: Ife014edf4f452da361f3eaaae19209ef6ff6958b
Diffstat (limited to 'services/audioflinger/FastMixerState.h')
-rw-r--r--services/audioflinger/FastMixerState.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/audioflinger/FastMixerState.h b/services/audioflinger/FastMixerState.h
index 64171ac..83094c8 100644
--- a/services/audioflinger/FastMixerState.h
+++ b/services/audioflinger/FastMixerState.h
@@ -17,6 +17,7 @@
#ifndef ANDROID_AUDIO_FAST_MIXER_STATE_H
#define ANDROID_AUDIO_FAST_MIXER_STATE_H
+#include <system/audio.h>
#include "AudioBufferProvider.h"
#include "NBAIO.h"
@@ -41,6 +42,8 @@ struct FastTrack {
AudioBufferProvider* mBufferProvider; // must not be NULL
VolumeProvider* mVolumeProvider; // optional; if NULL then full-scale
+ unsigned mSampleRate; // optional; if zero then use mixer sample rate
+ audio_channel_mask_t mChannelMask; // AUDIO_CHANNEL_OUT_MONO or AUDIO_CHANNEL_OUT_STEREO
int mGeneration; // increment when any field is assigned
};