diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-02-14 00:02:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-14 00:02:53 +0000 |
| commit | 7e1e1e61fca5334e11a0c26ab23e6122e742d517 (patch) | |
| tree | 30610a5b21cfa882a9f17a7b4cc39d11e8ccdd7d /services/audioflinger/AudioMixer.h | |
| parent | cef1245fe7522759ab5ccfab0d2a6e56aea8c2a6 (diff) | |
| parent | 7f2f8042cf335ab1323dec3edbe9143a06109f4e (diff) | |
| download | frameworks_av-7e1e1e61fca5334e11a0c26ab23e6122e742d517.zip frameworks_av-7e1e1e61fca5334e11a0c26ab23e6122e742d517.tar.gz frameworks_av-7e1e1e61fca5334e11a0c26ab23e6122e742d517.tar.bz2 | |
Merge "Revert "Temporary additional logging to investigate bug""
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index f757351..fd21fda 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -76,7 +76,6 @@ public: MAIN_BUFFER = 0x4002, AUX_BUFFER = 0x4003, DOWNMIX_TYPE = 0X4004, - FAST_INDEX = 0x4005, // for debugging only // for target RESAMPLE SAMPLE_RATE = 0x4100, // Configure sample rate conversion on this track name; // parameter 'value' is the new sample rate in Hz. @@ -201,8 +200,7 @@ private: int32_t sessionId; - int32_t fastIndex; - int32_t padding[1]; + int32_t padding[2]; // 16-byte boundary |