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
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 @@
 
     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
 };