diff options
author | Eric Laurent <elaurent@google.com> | 2013-02-04 17:05:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-04 17:05:30 +0000 |
commit | 83fa606bd629ac32a2dab5af255188acfa30db4a (patch) | |
tree | 41d2c6dc2fbb8ef4a30eac3593ffa22279513874 /services | |
parent | 5fa419b962f668e6fa9adf7e14fddea97cdb736e (diff) | |
parent | 201fc9c9feb4765a12bc39e95d25f3aa1deb8ffe (diff) | |
download | frameworks_av-83fa606bd629ac32a2dab5af255188acfa30db4a.zip frameworks_av-83fa606bd629ac32a2dab5af255188acfa30db4a.tar.gz frameworks_av-83fa606bd629ac32a2dab5af255188acfa30db4a.tar.bz2 |
Merge "AudioFlinger: fix RecordThread initial device"
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 6 | ||||
-rw-r--r-- | services/audioflinger/Threads.cpp | 5 | ||||
-rw-r--r-- | services/audioflinger/Threads.h | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 1270825..47c2772 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1650,14 +1650,14 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module, // Start record thread // RecorThread require both input and output device indication to forward to audio // pre processing modules - audio_devices_t device = (*pDevices) | primaryOutputDevice_l(); - thread = new RecordThread(this, input, reqSamplingRate, reqChannels, id, - device, teeSink); + primaryOutputDevice_l(), + *pDevices, + teeSink); mRecordThreads.add(id, thread); ALOGV("openInput() created record thread: ID %d thread %p", id, thread); if (pSamplingRate != NULL) *pSamplingRate = reqSamplingRate; diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 6f748d7..ba848d7 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3573,9 +3573,10 @@ AudioFlinger::RecordThread::RecordThread(const sp<AudioFlinger>& audioFlinger, uint32_t sampleRate, audio_channel_mask_t channelMask, audio_io_handle_t id, - audio_devices_t device, + audio_devices_t outDevice, + audio_devices_t inDevice, const sp<NBAIO_Sink>& teeSink) : - ThreadBase(audioFlinger, id, AUDIO_DEVICE_NONE, device, RECORD), + ThreadBase(audioFlinger, id, outDevice, inDevice, RECORD), mInput(input), mResampler(NULL), mRsmpOutBuffer(NULL), mRsmpInBuffer(NULL), // mRsmpInIndex and mInputBytes set by readInputParameters() mReqChannelCount(popcount(channelMask)), diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index 5fa7eaf..fa1e336 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -702,7 +702,8 @@ public: uint32_t sampleRate, audio_channel_mask_t channelMask, audio_io_handle_t id, - audio_devices_t device, + audio_devices_t outDevice, + audio_devices_t inDevice, const sp<NBAIO_Sink>& teeSink); virtual ~RecordThread(); |