summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-02-13 14:46:45 -0800
committerGlenn Kasten <gkasten@google.com>2013-02-13 14:51:50 -0800
commit0ddd56316262ac74a95e9edb595697c163136d6d (patch)
tree2ed313557a019eeba286e27a3f4ce2e0a45fba17 /services/audioflinger/AudioMixer.h
parentcd27b0798f6abb34e464acc7c7e97e066cd3c6c7 (diff)
downloadframeworks_av-0ddd56316262ac74a95e9edb595697c163136d6d.zip
frameworks_av-0ddd56316262ac74a95e9edb595697c163136d6d.tar.gz
frameworks_av-0ddd56316262ac74a95e9edb595697c163136d6d.tar.bz2
Temporary additional logging to investigate bug
The bug appears related to continuing to use an invalid buffer provider in fast mixer after track destruction, so focus the added logs in that area. Also includes a bug fix: was calling log in an unsafe place near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250. Details: - include caller pid or client pid where appropriate - increase log buffer size - log mFastIndex when AudioMixer sees an invalid bufferProvider. - log both potentially modified and actually modified tracks in FastMixer. - fix benign bug where sq->end() was called more than once. - log StateQueue push() call and return. Bug: 6490974 Change-Id: Iee7c8f40e20b6000cd8286c0ec6a14fff4a37af1
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
-rw-r--r--services/audioflinger/AudioMixer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h
index fd21fda..f757351 100644
--- a/services/audioflinger/AudioMixer.h
+++ b/services/audioflinger/AudioMixer.h
@@ -76,6 +76,7 @@ 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.
@@ -200,7 +201,8 @@ private:
int32_t sessionId;
- int32_t padding[2];
+ int32_t fastIndex;
+ int32_t padding[1];
// 16-byte boundary