diff options
| author | Andy Hung <hunga@google.com> | 2014-05-23 23:51:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 23:51:17 +0000 |
| commit | c62476f0c0c1cf9283a38852bde0a4c9434df712 (patch) | |
| tree | 6249b263dba1e91017e9debfe4c2e8f79b1be2c7 /services/audioflinger/FastMixerState.h | |
| parent | 7a470c375c2cef8b186fbadd9915b30e5d757453 (diff) | |
| parent | e8a1ced4da17dc6c07803dc2af8060f62a8389c1 (diff) | |
| download | frameworks_av-c62476f0c0c1cf9283a38852bde0a4c9434df712.zip frameworks_av-c62476f0c0c1cf9283a38852bde0a4c9434df712.tar.gz frameworks_av-c62476f0c0c1cf9283a38852bde0a4c9434df712.tar.bz2 | |
Merge "Add format parameter to getTrackName() and track_t"
Diffstat (limited to 'services/audioflinger/FastMixerState.h')
| -rw-r--r-- | services/audioflinger/FastMixerState.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/audioflinger/FastMixerState.h b/services/audioflinger/FastMixerState.h index e388fb3..661c9ca 100644 --- a/services/audioflinger/FastMixerState.h +++ b/services/audioflinger/FastMixerState.h @@ -45,6 +45,7 @@ struct FastTrack { ExtendedAudioBufferProvider* mBufferProvider; // must be NULL if inactive, or non-NULL if active VolumeProvider* mVolumeProvider; // optional; if NULL then full-scale audio_channel_mask_t mChannelMask; // AUDIO_CHANNEL_OUT_MONO or AUDIO_CHANNEL_OUT_STEREO + audio_format_t mFormat; // track format int mGeneration; // increment when any field is assigned }; |