summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.h
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2012-01-04 13:00:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-04 13:00:49 -0800
commitfe0698f9d44ca923ff1ba528f2c42019937ea5e2 (patch)
tree2ffdfd9dbc064aa3d2a9b229f87b679220ef4f79 /services/audioflinger/AudioMixer.h
parent183c525aee3b683f6d92b0b6e7197a3989ddee1a (diff)
parent071ccd5a9702500f3f7d62ef881300914926184d (diff)
downloadframeworks_av-fe0698f9d44ca923ff1ba528f2c42019937ea5e2.zip
frameworks_av-fe0698f9d44ca923ff1ba528f2c42019937ea5e2.tar.gz
frameworks_av-fe0698f9d44ca923ff1ba528f2c42019937ea5e2.tar.bz2
am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
* commit 'fb578b6b88af51812b71a86ad4dd3a7de56e394b': audioflinger: fix clicks on 48kHz audio.
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
-rw-r--r--services/audioflinger/AudioMixer.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h
index 75c9170..0137185 100644
--- a/services/audioflinger/AudioMixer.h
+++ b/services/audioflinger/AudioMixer.h
@@ -91,6 +91,8 @@ public:
static void ditherAndClamp(int32_t* out, int32_t const *sums, size_t c);
+ size_t getUnreleasedFrames(int name);
+
private:
enum {
@@ -167,6 +169,7 @@ private:
bool doesResample() const;
void resetResampler();
void adjustVolumeRamp(bool aux);
+ size_t getUnreleasedFrames();
};
// pad to 32-bytes to fill cache line