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 /services | |
| 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 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/FastMixer.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index f9cc17b..039a0d8 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1783,7 +1783,7 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module, popcount(inStream->common.get_channels(&inStream->common))); if (!mTeeSinkInputEnabled) { kind = TEE_SINK_NO; - } else if (format == Format_Invalid) { + } else if (!Format_isValid(format)) { kind = TEE_SINK_NO; } else if (mRecordTeeSink == 0) { kind = TEE_SINK_NEW; diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index 7126e92..28b9d77 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -239,7 +239,7 @@ bool FastMixer::threadLoop() dumpState->mSampleRate = sampleRate; } - if ((format != previousFormat) || (frameCount != previous->mFrameCount)) { + if ((!Format_isEqual(format, previousFormat)) || (frameCount != previous->mFrameCount)) { // FIXME to avoid priority inversion, don't delete here delete mixer; mixer = NULL; diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index d8d7790..19e715a 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -146,7 +146,7 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( #ifdef TEE_SINK if (mTeeSinkTrackEnabled) { NBAIO_Format pipeFormat = Format_from_SR_C(mSampleRate, mChannelCount); - if (pipeFormat != Format_Invalid) { + if (Format_isValid(pipeFormat)) { Pipe *pipe = new Pipe(mTeeSinkTrackFrames, pipeFormat); size_t numCounterOffers = 0; const NBAIO_Format offers[1] = {pipeFormat}; |