diff options
author | Glenn Kasten <gkasten@google.com> | 2014-05-07 11:17:52 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2014-05-07 11:28:13 -0700 |
commit | 828f883a43f66f77d776a75d0ea2b87c7c826071 (patch) | |
tree | ab16e918df8275d8460a00b72cdd6ced890350bb | |
parent | 8e085cbeccb1138d52a0a423af02e6ab41b4fee4 (diff) | |
download | frameworks_av-828f883a43f66f77d776a75d0ea2b87c7c826071.zip frameworks_av-828f883a43f66f77d776a75d0ea2b87c7c826071.tar.gz frameworks_av-828f883a43f66f77d776a75d0ea2b87c7c826071.tar.bz2 |
Fix a couple of fast capture typo bugs
AudioRecord constructor was not passing flags through to set().
Server-side check was using wrong kind of channel mask.
Change-Id: Ifaa880ec323771e9fd168262be05f3e539f53390
-rw-r--r-- | media/libmedia/AudioRecord.cpp | 4 | ||||
-rw-r--r-- | services/audioflinger/Threads.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index a7bf380..2c8605c 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -79,14 +79,14 @@ AudioRecord::AudioRecord( uint32_t notificationFrames, int sessionId, transfer_type transferType, - audio_input_flags_t flags __unused) + audio_input_flags_t flags) : mStatus(NO_INIT), mSessionId(AUDIO_SESSION_ALLOCATE), mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(SP_DEFAULT), mProxy(NULL) { mStatus = set(inputSource, sampleRate, format, channelMask, frameCount, cbf, user, - notificationFrames, false /*threadCanCallJava*/, sessionId, transferType); + notificationFrames, false /*threadCanCallJava*/, sessionId, transferType, flags); } AudioRecord::~AudioRecord() diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index be37436..a916b32 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -5102,8 +5102,8 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe // PCM data audio_is_linear_pcm(format) && // mono or stereo - ( (channelMask == AUDIO_CHANNEL_OUT_MONO) || - (channelMask == AUDIO_CHANNEL_OUT_STEREO) ) && + ( (channelMask == AUDIO_CHANNEL_IN_MONO) || + (channelMask == AUDIO_CHANNEL_IN_STEREO) ) && // hardware sample rate // FIXME actually the native hardware sample rate (sampleRate == mSampleRate) && |