Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83fa606b authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "AudioFlinger: fix RecordThread initial device"

parents 5fa419b9 201fc9c9

services/audioflinger/AudioFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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;

services/audioflinger/Threads.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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)),

services/audioflinger/Threads.h

+2 −1
Original line number Diff line number Diff line
@@ -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();