From f69f9869514730aebe5724c461768507084dfff7 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Fri, 7 Mar 2014 08:37:57 -0800 Subject: NBAIO::Format_from_SR_C requires audio_format_t parameter Change-Id: I4b65f6ed2f6ca3608b3a5f88f52a93af0b9b1f4a --- include/media/nbaio/NBAIO.h | 5 ++--- media/libnbaio/AudioStreamInSource.cpp | 2 +- media/libnbaio/AudioStreamOutSink.cpp | 2 +- services/audioflinger/Threads.cpp | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/media/nbaio/NBAIO.h b/include/media/nbaio/NBAIO.h index ab9a4a5..5278bf8 100644 --- a/include/media/nbaio/NBAIO.h +++ b/include/media/nbaio/NBAIO.h @@ -67,9 +67,8 @@ extern const NBAIO_Format Format_Invalid; size_t Format_frameSize(const NBAIO_Format& format); // Convert a sample rate in Hz and channel count to an NBAIO_Format -// FIXME Remove the default value of AUDIO_FORMAT_PCM_16_BIT, and rename -NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount, - audio_format_t format = AUDIO_FORMAT_PCM_16_BIT); +// FIXME rename +NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount, audio_format_t format); // Return the sample rate in Hz of an NBAIO_Format unsigned Format_sampleRate(const NBAIO_Format& format); 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); diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 690d0d6..8fdb50d 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -2567,7 +2567,7 @@ AudioFlinger::MixerThread::MixerThread(const sp& audioFlinger, Aud // create an NBAIO sink for the HAL output stream, and negotiate mOutputSink = new AudioStreamOutSink(output->stream); size_t numCounterOffers = 0; - const NBAIO_Format offers[1] = {Format_from_SR_C(mSampleRate, mChannelCount)}; + const NBAIO_Format offers[1] = {Format_from_SR_C(mSampleRate, mChannelCount, mFormat)}; ssize_t index = mOutputSink->negotiate(offers, 1, NULL, numCounterOffers); ALOG_ASSERT(index == 0); -- cgit v1.1