diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-07 20:09:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-07 20:09:26 +0000 |
| commit | ad77a5e08282a92903f91c414b8f65797cb72dde (patch) | |
| tree | 0f14d23d8b7a26669317bb29055301a473821f2e /media | |
| parent | 9f916def8ce39528ad2fe56a2b199fa61d6fe383 (diff) | |
| parent | f69f9869514730aebe5724c461768507084dfff7 (diff) | |
| download | frameworks_av-ad77a5e08282a92903f91c414b8f65797cb72dde.zip frameworks_av-ad77a5e08282a92903f91c414b8f65797cb72dde.tar.gz frameworks_av-ad77a5e08282a92903f91c414b8f65797cb72dde.tar.bz2 | |
Merge "NBAIO::Format_from_SR_C requires audio_format_t parameter"
Diffstat (limited to 'media')
| -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); |