diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-16 17:17:28 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-07-30 08:44:15 -0700 |
| commit | eced2daaa6c91a3731eef978ce65c6ec319c5e6a (patch) | |
| tree | 635d4e4f9ed3dccd52f53b1e91db4c4402733c3a | |
| parent | a30e75897934da2ce7b1b03bcb4b58e139d3e81e (diff) | |
| download | frameworks_av-eced2daaa6c91a3731eef978ce65c6ec319c5e6a.zip frameworks_av-eced2daaa6c91a3731eef978ce65c6ec319c5e6a.tar.gz frameworks_av-eced2daaa6c91a3731eef978ce65c6ec319c5e6a.tar.bz2 | |
Use correct type for OutputDescriptor::format
Change-Id: Ide608ef452d57da29b708180d90470361c123d1d
| -rw-r--r-- | include/media/AudioSystem.h | 2 | ||||
| -rw-r--r-- | media/libmedia/IAudioFlingerClient.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index f9e625e..006af08 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -158,7 +158,7 @@ public: : samplingRate(0), format(AUDIO_FORMAT_DEFAULT), channelMask(0), frameCount(0), latency(0) {} uint32_t samplingRate; - int32_t format; + audio_format_t format; audio_channel_mask_t channelMask; size_t frameCount; uint32_t latency; diff --git a/media/libmedia/IAudioFlingerClient.cpp b/media/libmedia/IAudioFlingerClient.cpp index 84a589a..3c0d4cf 100644 --- a/media/libmedia/IAudioFlingerClient.cpp +++ b/media/libmedia/IAudioFlingerClient.cpp @@ -83,7 +83,7 @@ status_t BnAudioFlingerClient::onTransact( ALOGV("STREAM_CONFIG_CHANGED stream %d", stream); } else if (event != AudioSystem::OUTPUT_CLOSED && event != AudioSystem::INPUT_CLOSED) { desc.samplingRate = data.readInt32(); - desc.format = data.readInt32(); + desc.format = (audio_format_t) data.readInt32(); desc.channelMask = (audio_channel_mask_t) data.readInt32(); desc.frameCount = data.readInt32(); desc.latency = data.readInt32(); |