diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-01-31 09:41:08 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-02-03 17:10:57 -0800 |
| commit | 6e0d67d7b496ce17c0970a4ffd3a6f808860949c (patch) | |
| tree | e9d0c68908bcbbcb3eb5ef28b2b2c0db5488fa39 /media/libnbaio/AudioStreamInSource.cpp | |
| parent | cc1e0e807ee9a9f163a4685cbd6efd6ae55849cf (diff) | |
| download | frameworks_av-6e0d67d7b496ce17c0970a4ffd3a6f808860949c.zip frameworks_av-6e0d67d7b496ce17c0970a4ffd3a6f808860949c.tar.gz frameworks_av-6e0d67d7b496ce17c0970a4ffd3a6f808860949c.tar.bz2 | |
Use Format_isValid() and Format_isEqual() instead of direct comparison
Change-Id: Ie87607aa514976947540a77775e6425c4e56e7d9
Diffstat (limited to 'media/libnbaio/AudioStreamInSource.cpp')
| -rw-r--r-- | media/libnbaio/AudioStreamInSource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libnbaio/AudioStreamInSource.cpp b/media/libnbaio/AudioStreamInSource.cpp index 05273f6..ae8fac8 100644 --- a/media/libnbaio/AudioStreamInSource.cpp +++ b/media/libnbaio/AudioStreamInSource.cpp @@ -40,7 +40,7 @@ AudioStreamInSource::~AudioStreamInSource() ssize_t AudioStreamInSource::negotiate(const NBAIO_Format offers[], size_t numOffers, NBAIO_Format counterOffers[], size_t& numCounterOffers) { - if (mFormat == Format_Invalid) { + if (!Format_isValid(mFormat)) { 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) { @@ -67,7 +67,7 @@ size_t AudioStreamInSource::framesOverrun() ssize_t AudioStreamInSource::read(void *buffer, size_t count) { - if (CC_UNLIKELY(mFormat == Format_Invalid)) { + if (CC_UNLIKELY(!Format_isValid(mFormat))) { return NEGOTIATE; } ssize_t bytesRead = mStream->read(mStream, buffer, count << mBitShift); |