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

Commit 624a7fcb authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Use audio_channel_mask_t in AudioRecord 

Change-Id: I9e1b918b2635d961604a4a9d88eb1c7179a167a7
parent 70be725d

include/media/AudioRecord.h

+4 −4
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public: 
                        AudioRecord(audio_source_t inputSource,

                                    uint32_t sampleRate = 0,

                                    audio_format_t format = AUDIO_FORMAT_DEFAULT,

                                    uint32_t channelMask = AUDIO_CHANNEL_IN_MONO,

                                    audio_channel_mask_t channelMask = AUDIO_CHANNEL_IN_MONO,

                                    int frameCount      = 0,

                                    callback_t cbf = NULL,

                                    void* user = NULL,
@@ -164,7 +164,7 @@ public: 
            status_t    set(audio_source_t inputSource = AUDIO_SOURCE_DEFAULT,

                            uint32_t sampleRate = 0,

                            audio_format_t format = AUDIO_FORMAT_DEFAULT,

                            uint32_t channelMask = AUDIO_CHANNEL_IN_MONO,

                            audio_channel_mask_t channelMask = AUDIO_CHANNEL_IN_MONO,

                            int frameCount      = 0,

                            callback_t cbf = NULL,

                            void* user = NULL,
@@ -337,7 +337,7 @@ private: 
            bool processAudioBuffer(const sp<ClientRecordThread>& thread);

            status_t openRecord_l(uint32_t sampleRate,

                                audio_format_t format,

                                uint32_t channelMask,

                                audio_channel_mask_t channelMask,

                                int frameCount,

                                audio_io_handle_t input);

            audio_io_handle_t getInput_l();
@@ -369,7 +369,7 @@ private: 
    bool                    mMarkerReached;

    uint32_t                mNewPosition;

    uint32_t                mUpdatePeriod;

    uint32_t                mChannelMask;

    audio_channel_mask_t    mChannelMask;

    audio_io_handle_t       mInput;

    int                     mSessionId;

    int                     mPreviousPriority;          // before start()

media/libmedia/AudioRecord.cpp

+4 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ AudioRecord::AudioRecord( 
        audio_source_t inputSource,

        uint32_t sampleRate,

        audio_format_t format,

        uint32_t channelMask,

        audio_channel_mask_t channelMask,

        int frameCount,

        callback_t cbf,

        void* user,
@@ -111,7 +111,7 @@ status_t AudioRecord::set( 
        audio_source_t inputSource,

        uint32_t sampleRate,

        audio_format_t format,

        uint32_t channelMask,

        audio_channel_mask_t channelMask,

        int frameCount,

        callback_t cbf,

        void* user,
@@ -120,7 +120,7 @@ status_t AudioRecord::set( 
        int sessionId)

{



    ALOGV("set(): sampleRate %d, channelMask %d, frameCount %d",sampleRate, channelMask, frameCount);

    ALOGV("set(): sampleRate %d, channelMask %#x, frameCount %d",sampleRate, channelMask, frameCount);



    AutoMutex lock(mLock);
@@ -444,7 +444,7 @@ unsigned int AudioRecord::getInputFramesLost() const 
status_t AudioRecord::openRecord_l(

        uint32_t sampleRate,

        audio_format_t format,

        uint32_t channelMask,

        audio_channel_mask_t channelMask,

        int frameCount,

        audio_io_handle_t input)

{