diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-05-05 17:57:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-05 17:57:58 +0000 |
| commit | d8484dd4cf124854e7ff950da4300887f32fd05b (patch) | |
| tree | d73f7050caa36e2f8837f700472dc05cb93ec286 /services/audioflinger | |
| parent | f2776a5692bb4228decbe4ea3c8cc6df1d9c684c (diff) | |
| parent | 993fa0603707e94ce259e95e56838a85b5ccbdc5 (diff) | |
| download | frameworks_av-d8484dd4cf124854e7ff950da4300887f32fd05b.zip frameworks_av-d8484dd4cf124854e7ff950da4300887f32fd05b.tar.gz frameworks_av-d8484dd4cf124854e7ff950da4300887f32fd05b.tar.bz2 | |
Merge "Use audio_is_linear_pcm()"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index ae3dd8b..be37436 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1343,7 +1343,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac switch (mType) { case DIRECT: - if ((format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_PCM) { + if (audio_is_linear_pcm(format)) { if (sampleRate != mSampleRate || format != mFormat || channelMask != mChannelMask) { ALOGE("createTrack_l() Bad parameter: sampleRate %u format %#x, channelMask 0x%08x " "for output %p with format %#x", @@ -1365,7 +1365,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac break; default: - if ((format & AUDIO_FORMAT_MAIN_MASK) != AUDIO_FORMAT_PCM) { + if (!audio_is_linear_pcm(format)) { ALOGE("createTrack_l() Bad parameter: format %#x \"" "for output %p with format %#x", format, mOutput, mFormat); |