summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.h
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-12-22 16:08:41 -0800
committerEric Laurent <elaurent@google.com>2011-12-22 16:08:41 -0800
commit071ccd5a9702500f3f7d62ef881300914926184d (patch)
tree2ffdfd9dbc064aa3d2a9b229f87b679220ef4f79 /services/audioflinger/AudioMixer.h
parent69aac3e6cd68e8c305a41b2677123db7662efd4b (diff)
downloadframeworks_av-071ccd5a9702500f3f7d62ef881300914926184d.zip
frameworks_av-071ccd5a9702500f3f7d62ef881300914926184d.tar.gz
frameworks_av-071ccd5a9702500f3f7d62ef881300914926184d.tar.bz2
audioflinger: fix clicks on 48kHz audio.
The calculation done in prepareTracks_l() for the minimum amount off frames needed to mix one output buffer had 2 issues: - the additional sample needed for interpolation was not included - the fact that the resampler does not acknowledge the frames consumed immediately after each mixing round but only once all frames requested have been used was not taken into account. Thus the number of frames available in track buffer could be considered sufficient although it was not and the resampler would abort producing a short silence perceived as a click. Issue 5727099. Change-Id: I7419847a7474c7d9f9170bedd0a636132262142c
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