diff options
author | Glenn Kasten <gkasten@google.com> | 2012-08-29 11:10:32 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-08-30 10:53:37 -0700 |
commit | 2dd4bdd715f586d4d30cf90cc6fc2bbfbce60fe0 (patch) | |
tree | d0f594b402b6d2a4de89386c30c3db4adab89894 /media/libnbaio/AudioStreamOutSink.cpp | |
parent | 0a24726a64ba1c50aa6ee1610de2d80602d49fe6 (diff) |
Move libnbaio out of AudioFlinger
libnbaio is now a separate shared library from AudioFlinger, rather
than a static library used only by AudioFlinger.
AudioBufferProvider interface is now also independent of AudioFlinger,
moved to include/media/
Change-Id: I9bb62ffbc38d42a38b0af76e66da5e9ab1e0e21b
Diffstat (limited to 'media/libnbaio/AudioStreamOutSink.cpp')
-rw-r--r-- | media/libnbaio/AudioStreamOutSink.cpp | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/media/libnbaio/AudioStreamOutSink.cpp b/media/libnbaio/AudioStreamOutSink.cpp new file mode 100644 index 00000000..6f525e5d --- /dev/null +++ b/media/libnbaio/AudioStreamOutSink.cpp @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define LOG_TAG "AudioStreamOutSink" +//#define LOG_NDEBUG 0 + +#include <utils/Log.h> +#include <media/nbaio/AudioStreamOutSink.h> + +namespace android { + +AudioStreamOutSink::AudioStreamOutSink(audio_stream_out *stream) : + NBAIO_Sink(), + mStream(stream), + mStreamBufferSizeBytes(0) +{ + ALOG_ASSERT(stream != NULL); +} + +AudioStreamOutSink::~AudioStreamOutSink() +{ +} + +ssize_t AudioStreamOutSink::negotiate(const NBAIO_Format offers[], size_t numOffers, + NBAIO_Format counterOffers[], size_t& numCounterOffers) +{ + if (mFormat == Format_Invalid) { + mStreamBufferSizeBytes = mStream->common.get_buffer_size(&mStream->common); + audio_format_t streamFormat = mStream->common.get_format(&mStream->common); + if (streamFormat == AUDIO_FORMAT_PCM_16_BIT) { + 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)); + mBitShift = Format_frameBitShift(mFormat); + } + } + return NBAIO_Sink::negotiate(offers, numOffers, counterOffers, numCounterOffers); +} + +ssize_t AudioStreamOutSink::write(const void *buffer, size_t count) +{ + if (!mNegotiated) { + return NEGOTIATE; + } + ALOG_ASSERT(mFormat != Format_Invalid); + ssize_t ret = mStream->write(mStream, buffer, count << mBitShift); + if (ret > 0) { + ret >>= mBitShift; + mFramesWritten += ret; + } else { + // FIXME verify HAL implementations are returning the correct error codes e.g. WOULD_BLOCK + } + return ret; +} + +status_t AudioStreamOutSink::getNextWriteTimestamp(int64_t *timestamp) { + ALOG_ASSERT(timestamp != NULL); + + if (NULL == mStream) + return INVALID_OPERATION; + + if (NULL == mStream->get_next_write_timestamp) + return INVALID_OPERATION; + + return mStream->get_next_write_timestamp(mStream, timestamp); +} + +} // namespace android |