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

Commit 1afd622b authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge changes 2023,2036 into donut 

* changes:
  Update more references to openInputStream in support classes. Continuation of bug 1846343
  Modify AudioFlinger to use updated openInputStream factory method. Continuation of bug 1846343
parents 6b566aff 6554773d

libs/audioflinger/A2dpAudioInterface.cpp

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ AudioStreamOut* A2dpAudioInterface::openOutputStream( 
}



AudioStreamIn* A2dpAudioInterface::openInputStream(

        int format, int channelCount, uint32_t sampleRate, status_t *status,

        AudioSystem::audio_in_acoustics acoustics)

        int inputSource, int format, int channelCount, uint32_t sampleRate,

        status_t *status, AudioSystem::audio_in_acoustics acoustics)

{

    if (status)

        *status = -1;

libs/audioflinger/A2dpAudioInterface.h

+12 −0
Original line number Diff line number Diff line
@@ -55,12 +55,24 @@ public: 
                                status_t *status=0);



    virtual AudioStreamIn* openInputStream(

                                int inputSource,

                                int format,

                                int channelCount,

                                uint32_t sampleRate,

                                status_t *status,

                                AudioSystem::audio_in_acoustics acoustics);



    // DEPRECATED - WILL BE REMOVED

    virtual AudioStreamIn* openInputStream(

                                int format,

                                int channelCount,

                                uint32_t sampleRate,

                                status_t *status,

                                AudioSystem::audio_in_acoustics acoustics)

    {

        return openInputStream(-1, format, channelCount, sampleRate, status, acoustics);

    }



protected:

    virtual status_t    doRouting();

    virtual status_t    dump(int fd, const Vector<String16>& args);

libs/audioflinger/AudioDumpInterface.h

+7 −3
Original line number Diff line number Diff line
@@ -78,9 +78,13 @@ public: 
    virtual status_t    setParameter(const char* key, const char* value)

                            {return mFinalInterface->setParameter(key, value);}



    virtual AudioStreamIn* openInputStream( int format, int channelCount, uint32_t sampleRate, status_t *status,

                                            AudioSystem::audio_in_acoustics acoustics)

                            {return mFinalInterface->openInputStream( format, channelCount, sampleRate, status, acoustics);}

    virtual AudioStreamIn* openInputStream(int inputSource, int format, int channelCount,

            uint32_t sampleRate, status_t *status, AudioSystem::audio_in_acoustics acoustics)

        { return mFinalInterface->openInputStream(inputSource, format, channelCount, sampleRate, status, acoustics); }



    virtual AudioStreamIn* openInputStream(int format, int channelCount, uint32_t sampleRate,

            status_t *status, AudioSystem::audio_in_acoustics acoustics)

        { return mFinalInterface->openInputStream(-1, format, channelCount, sampleRate, status, acoustics); }



    virtual status_t    dump(int fd, const Vector<String16>& args) { return mFinalInterface->dumpState(fd, args); }

libs/audioflinger/AudioFlinger.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2407,7 +2407,9 @@ bool AudioFlinger::AudioRecordThread::threadLoop() 
               

                LOGV("AudioRecordThread: loop starting");

                if (mRecordTrack != 0) {

                    input = mAudioHardware->openInputStream(mRecordTrack->format(), 

                    input = mAudioHardware->openInputStream(

                                    mRecordTrack->type(),

                                    mRecordTrack->format(), 

                                    mRecordTrack->channelCount(), 

                                    mRecordTrack->sampleRate(), 

                                    &mStartStatus,