summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-03-18 09:34:41 -0700
committerGlenn Kasten <gkasten@google.com>2012-07-25 18:49:08 -0700
commit52008f821a5202502a82a8ba2c024e69bd336350 (patch)
tree5daaddaa46d47bec27af0bc5350f414452710b00 /services/audioflinger/AudioMixer.h
parent0a7af18d0308295405491f86603e3d119450aba0 (diff)
downloadframeworks_av-52008f821a5202502a82a8ba2c024e69bd336350.zip
frameworks_av-52008f821a5202502a82a8ba2c024e69bd336350.tar.gz
frameworks_av-52008f821a5202502a82a8ba2c024e69bd336350.tar.bz2
Share local time frequency for all tracks & mixers
Change-Id: I5e6f0e371f728a5225c2fa6f778c109449d33602
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
-rw-r--r--services/audioflinger/AudioMixer.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h
index 46deae7..66abb4f 100644
--- a/services/audioflinger/AudioMixer.h
+++ b/services/audioflinger/AudioMixer.h
@@ -188,11 +188,9 @@ private:
// 16-byte boundary
- uint64_t localTimeFreq;
-
DownmixerBufferProvider* downmixerBufferProvider; // 4 bytes
- int32_t padding;
+ int32_t padding[3];
// 16-byte boundary
@@ -274,6 +272,10 @@ private:
static int64_t calculateOutputPTS(const track_t& t, int64_t basePTS,
int outputFrameIndex);
+
+ static uint64_t sLocalTimeFreq;
+ static pthread_once_t sOnceControl;
+ static void sInitRoutine();
};
// ----------------------------------------------------------------------------