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 | 085205bd23c3604c1b792c3046fdae0a489c04be (patch) | |
| tree | 82b017a4c77a82fca62571eccaa3723ee93738d1 /services/audioflinger/AudioMixer.h | |
| parent | 736c738738b7a4222486f0fa41d83ed58870be54 (diff) | |
| parent | 51eb3965caa8ba135bcdd8ffb7a2024a042ecdc0 (diff) | |
| download | frameworks_av-085205bd23c3604c1b792c3046fdae0a489c04be.zip frameworks_av-085205bd23c3604c1b792c3046fdae0a489c04be.tar.gz frameworks_av-085205bd23c3604c1b792c3046fdae0a489c04be.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 |