Return negotiated format with HAL in AudioFlinger

Fixes an issue caused by extended precision and the FastMixer
when the format to the FastMixer was returned instead of the
HAL format.

Change-Id: I2be9d55d5c87d82e46b5200b07fcdd986ebde08a

1 files changed, 6 insertions, 2 deletions

diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h
index c265833..3b7257b 100644
--- a/services/audioflinger/Threads.h
+++ b/services/audioflinger/Threads.h
@@ -234,7 +234,7 @@ public:
                 // dynamic externally-visible
                 uint32_t    sampleRate() const { return mSampleRate; }
                 audio_channel_mask_t channelMask() const { return mChannelMask; }
-                audio_format_t format() const { return mFormat; }
+                audio_format_t format() const { return mHALFormat; }
                 // Called by AudioFlinger::frameCount(audio_io_handle_t output) and effects,
                 // and returns the [normal mix] buffer's frame count.
     virtual     size_t      frameCount() const = 0;
@@ -407,7 +407,11 @@ protected:
                 audio_channel_mask_t    mChannelMask;
                 uint32_t                mChannelCount;
                 size_t                  mFrameSize;
-                audio_format_t          mFormat;
+                audio_format_t          mFormat;           // Source format for Recording and
+                                                           // Sink format for Playback.
+                                                           // Sink format may be different than
+                                                           // HAL format if Fastmixer is used.
+                audio_format_t          mHALFormat;
                 size_t                  mBufferSize;       // HAL buffer size for read() or write()
 
                 Vector< sp<ConfigEvent> >     mConfigEvents;