diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-07 08:37:57 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-03-07 08:39:09 -0800 |
| commit | f69f9869514730aebe5724c461768507084dfff7 (patch) | |
| tree | 0f14d23d8b7a26669317bb29055301a473821f2e /media/libnbaio | |
| parent | 8eec77066635c30b8ddce79cf9433357cf3afa1a (diff) | |
| download | frameworks_av-f69f9869514730aebe5724c461768507084dfff7.zip frameworks_av-f69f9869514730aebe5724c461768507084dfff7.tar.gz frameworks_av-f69f9869514730aebe5724c461768507084dfff7.tar.bz2 | |
NBAIO::Format_from_SR_C requires audio_format_t parameter
Change-Id: I4b65f6ed2f6ca3608b3a5f88f52a93af0b9b1f4a
Diffstat (limited to 'media/libnbaio')
| -rw-r--r-- | media/libnbaio/AudioStreamInSource.cpp | 2 | ||||
| -rw-r--r-- | media/libnbaio/AudioStreamOutSink.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libnbaio/AudioStreamInSource.cpp b/media/libnbaio/AudioStreamInSource.cpp index cee90dd..80bf61a 100644 --- a/media/libnbaio/AudioStreamInSource.cpp +++ b/media/libnbaio/AudioStreamInSource.cpp @@ -46,7 +46,7 @@ ssize_t AudioStreamInSource::negotiate(const NBAIO_Format offers[], size_t numOf uint32_t sampleRate = mStream->common.get_sample_rate(&mStream->common); audio_channel_mask_t channelMask = (audio_channel_mask_t) mStream->common.get_channels(&mStream->common); - mFormat = Format_from_SR_C(sampleRate, popcount(channelMask)); + mFormat = Format_from_SR_C(sampleRate, popcount(channelMask), streamFormat); mFrameSize = Format_frameSize(mFormat); } return NBAIO_Source::negotiate(offers, numOffers, counterOffers, numCounterOffers); diff --git a/media/libnbaio/AudioStreamOutSink.cpp b/media/libnbaio/AudioStreamOutSink.cpp index bff06f3..c28d34d 100644 --- a/media/libnbaio/AudioStreamOutSink.cpp +++ b/media/libnbaio/AudioStreamOutSink.cpp @@ -43,7 +43,7 @@ ssize_t AudioStreamOutSink::negotiate(const NBAIO_Format offers[], size_t numOff uint32_t sampleRate = mStream->common.get_sample_rate(&mStream->common); audio_channel_mask_t channelMask = (audio_channel_mask_t) mStream->common.get_channels(&mStream->common); - mFormat = Format_from_SR_C(sampleRate, popcount(channelMask)); + mFormat = Format_from_SR_C(sampleRate, popcount(channelMask), streamFormat); mFrameSize = Format_frameSize(mFormat); } return NBAIO_Sink::negotiate(offers, numOffers, counterOffers, numCounterOffers); |