summaryrefslogtreecommitdiffstats
path: root/media/libmedia/IAudioFlingerClient.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-07-16 17:19:58 -0700
committerGlenn Kasten <gkasten@google.com>2013-07-24 17:49:04 -0700
commitfad226abd12435dbcd232f7de396f1a097b2bd5f (patch)
tree4e5214f8f5b142239a9583e79032b70330fa7c8e /media/libmedia/IAudioFlingerClient.cpp
parent39a60318dcd78b2cb406d2c7dba57cbe9c99c3e7 (diff)
downloadframeworks_av-fad226abd12435dbcd232f7de396f1a097b2bd5f.zip
frameworks_av-fad226abd12435dbcd232f7de396f1a097b2bd5f.tar.gz
frameworks_av-fad226abd12435dbcd232f7de396f1a097b2bd5f.tar.bz2
Use standard name and type for channel mask
Former name 'channels' was ambiguous with respect to channel count. Change-Id: I716f792d95a7e0c787d27514ad6e93dbcef8a415
Diffstat (limited to 'media/libmedia/IAudioFlingerClient.cpp')
-rw-r--r--media/libmedia/IAudioFlingerClient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/IAudioFlingerClient.cpp b/media/libmedia/IAudioFlingerClient.cpp
index 2d1e0f8..84a589a 100644
--- a/media/libmedia/IAudioFlingerClient.cpp
+++ b/media/libmedia/IAudioFlingerClient.cpp
@@ -54,7 +54,7 @@ public:
(const AudioSystem::OutputDescriptor *)param2;
data.writeInt32(desc->samplingRate);
data.writeInt32(desc->format);
- data.writeInt32(desc->channels);
+ data.writeInt32(desc->channelMask);
data.writeInt32(desc->frameCount);
data.writeInt32(desc->latency);
}
@@ -84,7 +84,7 @@ status_t BnAudioFlingerClient::onTransact(
} else if (event != AudioSystem::OUTPUT_CLOSED && event != AudioSystem::INPUT_CLOSED) {
desc.samplingRate = data.readInt32();
desc.format = data.readInt32();
- desc.channels = data.readInt32();
+ desc.channelMask = (audio_channel_mask_t) data.readInt32();
desc.frameCount = data.readInt32();
desc.latency = data.readInt32();
param2 = &desc;