summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrackShared.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-12-04 12:22:46 -0800
committerGlenn Kasten <gkasten@google.com>2012-12-12 12:21:59 -0800
commite3aa659e9cee7df5c12a80d285cc29ab3b2cbb39 (patch)
tree90fdb6e9da1a03f4f24691aae27ae94ff913f1c7 /media/libmedia/AudioTrackShared.cpp
parent84b6440fa1d1274267deabe0bd8dc626b5548e4c (diff)
downloadframeworks_av-e3aa659e9cee7df5c12a80d285cc29ab3b2cbb39.zip
frameworks_av-e3aa659e9cee7df5c12a80d285cc29ab3b2cbb39.tar.gz
frameworks_av-e3aa659e9cee7df5c12a80d285cc29ab3b2cbb39.tar.bz2
Start isolating control block accesses in a proxy
The proxy object will eventually be the only code that understands the details of the control block. This should make it easier to change the control block in the future. Initial set of control block fields that are isolated: - sample rate - send level - volume Prepare for streaming/static separation by adding a union to the control block for the new fields. Fix bug in handling of max sample rate on a track. It was only checking at re-configuration, not at each mix. Simplify OutputTrack::obtainBuffer. Change-Id: I2249f9d04f73a911a922ad1d7f6197292c74cd92
Diffstat (limited to 'media/libmedia/AudioTrackShared.cpp')
-rw-r--r--media/libmedia/AudioTrackShared.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp
index bee13c8..13d47c9 100644
--- a/media/libmedia/AudioTrackShared.cpp
+++ b/media/libmedia/AudioTrackShared.cpp
@@ -26,7 +26,7 @@ audio_track_cblk_t::audio_track_cblk_t()
: lock(Mutex::SHARED), cv(Condition::SHARED), user(0), server(0),
userBase(0), serverBase(0), frameCount_(0),
loopStart(UINT_MAX), loopEnd(UINT_MAX), loopCount(0), mVolumeLR(0x10001000),
- mSendLevel(0), flags(0)
+ mSampleRate(0), mSendLevel(0), flags(0)
{
}