diff options
| author | Andy Hung <hunga@google.com> | 2014-02-28 16:23:02 -0800 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2014-03-01 04:20:18 +0000 |
| commit | 788207057ed4b8df4719ed8089f376ef52de9ca1 (patch) | |
| tree | 63659b6151de243ea608add08c3f5d2963c1bd3e /services/audioflinger/AudioMixer.h | |
| parent | 7ed1873acbf43280c5afe51833c3d628fe34e258 (diff) | |
| download | frameworks_av-788207057ed4b8df4719ed8089f376ef52de9ca1.zip frameworks_av-788207057ed4b8df4719ed8089f376ef52de9ca1.tar.gz frameworks_av-788207057ed4b8df4719ed8089f376ef52de9ca1.tar.bz2 | |
Rename mSinkFormat to mMixerFormat for AudioMixer::track_t
AudioMixer::SINK_FORMAT also changes to AudioMixer::MIXER_FORMAT
Change-Id: Ic3f8be77d2c75c082c4fd140bc907e30c304d285
Signed-off-by: Andy Hung <hunga@google.com>
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 3355db4..e5e120c 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -77,7 +77,7 @@ public: MAIN_BUFFER = 0x4002, AUX_BUFFER = 0x4003, DOWNMIX_TYPE = 0X4004, - SINK_FORMAT = 0x4005, // AUDIO_FORMAT_PCM_(FLOAT|16_BIT) + MIXER_FORMAT = 0x4005, // AUDIO_FORMAT_PCM_(FLOAT|16_BIT) // for target RESAMPLE SAMPLE_RATE = 0x4100, // Configure sample rate conversion on this track name; // parameter 'value' is the new sample rate in Hz. @@ -194,7 +194,7 @@ private: int32_t sessionId; - audio_format_t mSinkFormat; // at this time: AUDIO_FORMAT_PCM_(FLOAT|16_BIT) + audio_format_t mMixerFormat; // at this time: AUDIO_FORMAT_PCM_(FLOAT|16_BIT) int32_t padding[1]; |