diff options
author | Glenn Kasten <gkasten@google.com> | 2013-02-27 18:11:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-27 18:11:05 +0000 |
commit | 5e8e702658cd61fc07b4163fdbca3e8a5589f2b9 (patch) | |
tree | 064a4cd103612e4c77cbcbf1ee10cb7aa21d3df2 /services | |
parent | aebd9bbed761d99b20bb1871ed170021fb3c68ad (diff) | |
parent | 3c3c527a792249d07938c5c6cb9b465344a22383 (diff) | |
download | frameworks_av-5e8e702658cd61fc07b4163fdbca3e8a5589f2b9.zip frameworks_av-5e8e702658cd61fc07b4163fdbca3e8a5589f2b9.tar.gz frameworks_av-5e8e702658cd61fc07b4163fdbca3e8a5589f2b9.tar.bz2 |
Merge "Revert "Logging to investigate a crash"" into jb-mr2-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioMixer.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 2a8a955..17b6a8a 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -1113,12 +1113,6 @@ void AudioMixer::process__genericNoResampling(state_t* state, int64_t pts) e0 &= ~(1<<i); track_t& t = state->tracks[i]; t.buffer.frameCount = state->frameCount; - int valid = t.bufferProvider->getValid(); - if (valid != AudioBufferProvider::kValid) { - ALOGE("invalid bufferProvider=%p name=%d frameCount=%d valid=%#x enabledTracks=%#x", - t.bufferProvider, i, t.buffer.frameCount, valid, enabledTracks); - // expect to crash - } t.bufferProvider->getNextBuffer(&t.buffer, pts); t.frameCount = t.buffer.frameCount; t.in = t.buffer.raw; |