summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-12-14 17:35:14 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-12-14 17:35:14 -0800
commit53a166cabc956529d2336b04c26b9c03b550ab38 (patch)
tree78d99a44c8a08746e288e09b7cc04bc5f60f6c29 /services
parent2eda60a8485cfe70a60e72156beffdc470ecb093 (diff)
parent0cfd8231e4c489392809bf44c174315df2690145 (diff)
downloadframeworks_av-53a166cabc956529d2336b04c26b9c03b550ab38.zip
frameworks_av-53a166cabc956529d2336b04c26b9c03b550ab38.tar.gz
frameworks_av-53a166cabc956529d2336b04c26b9c03b550ab38.tar.bz2
Merge "AudioMixer uninitialized simple fields"
Diffstat (limited to 'services')
-rw-r--r--services/audioflinger/AudioMixer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
index 7c7fa56..63d9a88 100644
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@ -58,10 +58,16 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate)
t->needs = 0;
t->volume[0] = UNITY_GAIN;
t->volume[1] = UNITY_GAIN;
+ // no initialization needed
+ // t->prevVolume[0]
+ // t->prevVolume[1]
t->volumeInc[0] = 0;
t->volumeInc[1] = 0;
t->auxLevel = 0;
t->auxInc = 0;
+ // no initialization needed
+ // t->prevAuxLevel
+ // t->frameCount
t->channelCount = 2;
t->enabled = 0;
t->format = 16;