diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-11-19 11:53:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-19 11:53:53 -0800 |
| commit | 4d9cef6c007afd195a8f36d35d46b359bf909331 (patch) | |
| tree | 6ada6f23d2e14157c2f06a64cc3548ddf3c3fb84 /services/audioflinger | |
| parent | a6b47a17fb1288936b491f30cd751172a572df5c (diff) | |
| parent | a42ff007a17d63df22c60dd5e5fd811ee45ca1b3 (diff) | |
| download | frameworks_av-4d9cef6c007afd195a8f36d35d46b359bf909331.zip frameworks_av-4d9cef6c007afd195a8f36d35d46b359bf909331.tar.gz frameworks_av-4d9cef6c007afd195a8f36d35d46b359bf909331.tar.bz2 | |
Merge "Clean up channel count and channel mask"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 8 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 5f3754f..0c1ab3c 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -6181,7 +6181,7 @@ bool AudioFlinger::RecordThread::threadLoop() framesIn = framesOut; mRsmpInIndex += framesIn; framesOut -= framesIn; - if ((int)mChannelCount == mReqChannelCount || + if (mChannelCount == mReqChannelCount || mFormat != AUDIO_FORMAT_PCM_16_BIT) { memcpy(dst, src, framesIn * mFrameSize); } else { @@ -6197,7 +6197,7 @@ bool AudioFlinger::RecordThread::threadLoop() if (framesOut && mFrameCount == mRsmpInIndex) { void *readInto; if (framesOut == mFrameCount && - ((int)mChannelCount == mReqChannelCount || + (mChannelCount == mReqChannelCount || mFormat != AUDIO_FORMAT_PCM_16_BIT)) { readInto = buffer.raw; framesOut = 0; @@ -6576,7 +6576,7 @@ void AudioFlinger::RecordThread::dumpInternals(int fd, const Vector<String16>& a result.append(buffer); snprintf(buffer, SIZE, "Resampling: %d\n", (mResampler != NULL)); result.append(buffer); - snprintf(buffer, SIZE, "Out channel count: %d\n", mReqChannelCount); + snprintf(buffer, SIZE, "Out channel count: %u\n", mReqChannelCount); result.append(buffer); snprintf(buffer, SIZE, "Out sample rate: %u\n", mReqSampleRate); result.append(buffer); @@ -6674,7 +6674,7 @@ bool AudioFlinger::RecordThread::checkForNewParameters_l() int value; audio_format_t reqFormat = mFormat; uint32_t reqSamplingRate = mReqSampleRate; - int reqChannelCount = mReqChannelCount; + uint32_t reqChannelCount = mReqChannelCount; if (param.getInt(String8(AudioParameter::keySamplingRate), value) == NO_ERROR) { reqSamplingRate = value; diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 61f459c..2541b15 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -419,7 +419,7 @@ private: return mFormat; } - int channelCount() const { return mChannelCount; } + uint32_t channelCount() const { return mChannelCount; } audio_channel_mask_t channelMask() const { return mChannelMask; } @@ -565,7 +565,7 @@ private: // dynamic externally-visible uint32_t sampleRate() const { return mSampleRate; } - int channelCount() const { return mChannelCount; } + uint32_t channelCount() const { return mChannelCount; } audio_channel_mask_t channelMask() const { return mChannelMask; } audio_format_t format() const { return mFormat; } // Called by AudioFlinger::frameCount(audio_io_handle_t output) and effects, @@ -1593,7 +1593,7 @@ public: int16_t *mRsmpInBuffer; size_t mRsmpInIndex; size_t mInputBytes; - const int mReqChannelCount; + const uint32_t mReqChannelCount; const uint32_t mReqSampleRate; ssize_t mBytesRead; // sync event triggering actual audio capture. Frames read before this event will |