summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2009-10-06 19:28:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-06 19:28:06 -0700
commit821620494f0f073a27124e96139d5320df79d7e4 (patch)
treee673988e40ad5675198f2afd25b261fe2734705b /include
parentdba9981588503dbfc442216a857ff001f46fff60 (diff)
parent4e362817ab49da3325531e1213e70ec6bbe32084 (diff)
downloadframeworks_base-821620494f0f073a27124e96139d5320df79d7e4.zip
frameworks_base-821620494f0f073a27124e96139d5320df79d7e4.tar.gz
frameworks_base-821620494f0f073a27124e96139d5320df79d7e4.tar.bz2
am 4e362817: am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Merge commit '4e362817ab49da3325531e1213e70ec6bbe32084' into eclair-mr2-plus-aosp * commit '4e362817ab49da3325531e1213e70ec6bbe32084': Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
Diffstat (limited to 'include')
-rw-r--r--include/media/ToneGenerator.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h
index e8df08e..c884c2c 100644
--- a/include/media/ToneGenerator.h
+++ b/include/media/ToneGenerator.h
@@ -248,6 +248,7 @@ private:
// only if tone duration is less than about 27 Hours(@44100Hz sampling rate). If this time is exceeded,
// no crash will occur but tone sequence will show a glitch.
unsigned int mMaxSmp; // Maximum number of audio samples played (maximun tone duration)
+ int mDurationMs; // Maximum tone duration in ms
unsigned short mCurSegment; // Current segment index in ToneDescriptor segments[]
unsigned short mCurCount; // Current sequence repeat count