diff options
| author | Arne Coucheron <arco68@gmail.com> | 2014-10-25 06:34:08 +0200 |
|---|---|---|
| committer | LorDClockaN <davor@losinj.com> | 2014-11-02 15:54:35 +0100 |
| commit | 5d241e848c36e787cab757608ad919cea41e0e50 (patch) | |
| tree | 490a8e7887e0d2851a705832db540934d50d1873 /services/audioflinger/Threads.cpp | |
| parent | e11eaf2c557d72caf3aeda888d3cacf6cae1dc56 (diff) | |
av: Various fixes and cleanupskitkat
Change-Id: I82225d8cd3e2b3015e6c0e1dd9ddc5ec8abab525
Diffstat (limited to 'services/audioflinger/Threads.cpp')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index c92eeb257c..f93bd1dada 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3853,7 +3853,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep tracksToRemove->add(track); // indicate to client process that the track was disabled because of underrun; // it will then automatically call start() when data is available -#if defined(QCOM_HARDWARE) && !defined(QCOM_DIRECTTRACK) +#ifdef QCOM_HARDWARE android_atomic_or(CBLK_DISABLED, &cblk->mFlags); #endif } else if (last) { @@ -5680,17 +5680,19 @@ void AudioFlinger::RecordThread::readInputParameters() mChannelMask = mInput->stream->common.get_channels(&mInput->stream->common); mChannelCount = (uint16_t)getInputChannelCount(mChannelMask); mFormat = mInput->stream->common.get_format(&mInput->stream->common); -#ifdef QCOM_HARDWARE +#if defined(QCOM_HARDWARE) && !defined(QCOM_DIRECTTRACK) if (mFormat != AUDIO_FORMAT_PCM_16_BIT && !audio_is_compress_voip_format(mFormat) && !audio_is_compress_capture_format(mFormat)) { ALOGE("HAL format %d not supported", mFormat); } #else +#ifndef QCOM_DIRECTTRACK if (mFormat != AUDIO_FORMAT_PCM_16_BIT) { ALOGE("HAL format %d not supported; must be AUDIO_FORMAT_PCM_16_BIT", mFormat); } #endif +#endif mFrameSize = audio_stream_frame_size(&mInput->stream->common); mBufferSize = mInput->stream->common.get_buffer_size(&mInput->stream->common); mFrameCount = mBufferSize / mFrameSize; |