diff options
| author | Andy Hung <hunga@google.com> | 2015-05-12 00:30:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-12 00:30:52 +0000 |
| commit | af49160aa75d4e1750f3ed56b812ec9cc448fa46 (patch) | |
| tree | 28be21137eef5113692cbf9f6ab904c7f476b1c4 /services/audioflinger/Threads.cpp | |
| parent | 1ea0262553d7b88849c6392585e7173d8dc4bde6 (diff) | |
| parent | d1abb8f94d7ed749ee959655db1e07d26dad074d (diff) | |
| download | frameworks_av-af49160aa75d4e1750f3ed56b812ec9cc448fa46.zip frameworks_av-af49160aa75d4e1750f3ed56b812ec9cc448fa46.tar.gz frameworks_av-af49160aa75d4e1750f3ed56b812ec9cc448fa46.tar.bz2 | |
Merge "Allow 8 channels in RecordThread" into mnc-dev
Diffstat (limited to 'services/audioflinger/Threads.cpp')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index f2af312..e7fbc08 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -6698,9 +6698,7 @@ bool AudioFlinger::RecordThread::checkForNewParameter_l(const String8& keyValueP (mInput->stream->common.get_sample_rate(&mInput->stream->common) <= (AUDIO_RESAMPLER_DOWN_RATIO_MAX * samplingRate)) && audio_channel_count_from_in_mask( - mInput->stream->common.get_channels(&mInput->stream->common)) <= FCC_2 && - (channelMask == AUDIO_CHANNEL_IN_MONO || - channelMask == AUDIO_CHANNEL_IN_STEREO)) { + mInput->stream->common.get_channels(&mInput->stream->common)) <= FCC_8) { status = NO_ERROR; } if (status == NO_ERROR) { |