diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-05-07 18:55:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-07 18:55:04 +0000 |
| commit | a079461668e881718fa6c0de967e557f59da1cab (patch) | |
| tree | 0ace22f014314582cb2e02fe746da5bf9ae40cb4 | |
| parent | 703b67ed9552914f7763aed8f8bd054759db0576 (diff) | |
| parent | 828f883a43f66f77d776a75d0ea2b87c7c826071 (diff) | |
| download | frameworks_av-a079461668e881718fa6c0de967e557f59da1cab.zip frameworks_av-a079461668e881718fa6c0de967e557f59da1cab.tar.gz frameworks_av-a079461668e881718fa6c0de967e557f59da1cab.tar.bz2 | |
Merge "Fix a couple of fast capture typo bugs"
| -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) && |