diff options
author | Glenn Kasten <gkasten@google.com> | 2011-12-15 09:53:12 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2011-12-19 15:55:47 -0800 |
commit | 81a028fef62bcadf13fc8550067a3d29c918b3ca (patch) | |
tree | 9d2c12b20abcf5e1aad3522678e685b173db776b /services | |
parent | eebeceec684a36222b4559e3157b0db04c0a67ed (diff) | |
download | frameworks_av-81a028fef62bcadf13fc8550067a3d29c918b3ca.zip frameworks_av-81a028fef62bcadf13fc8550067a3d29c918b3ca.tar.gz frameworks_av-81a028fef62bcadf13fc8550067a3d29c918b3ca.tar.bz2 |
Remove dead code
Change-Id: Icf23f7f90fdeb660f4015f22cf239e6d05f5d03c
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioMixer.cpp | 3 | ||||
-rw-r--r-- | services/audioflinger/AudioMixer.h | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 7c7fa56..1c5796d 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -1115,6 +1115,7 @@ void AudioMixer::process__OneTrack16BitsStereoNoResampling(state_t* state) } } +#if 0 // 2 tracks is also a common case // NEVER used in current implementation of process__validate() // only use if the 2 tracks have the same output buffer @@ -1212,7 +1213,7 @@ void AudioMixer::process__TwoTracks16BitsStereoNoResampling(state_t* state) delete [] buff; } } +#endif // ---------------------------------------------------------------------------- }; // namespace android - diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 75c9170..f0bc9e8 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -117,11 +117,6 @@ private: NEEDS_AUX_ENABLED = 0x00010000, }; - static inline int32_t applyVolume(int32_t in, int32_t v) { - return in * v; - } - - struct state_t; struct track_t; @@ -201,7 +196,9 @@ private: static void process__genericNoResampling(state_t* state); static void process__genericResampling(state_t* state); static void process__OneTrack16BitsStereoNoResampling(state_t* state); +#if 0 static void process__TwoTracks16BitsStereoNoResampling(state_t* state); +#endif }; // ---------------------------------------------------------------------------- |