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

Commit dd8104cc authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Use audio_channel_mask_t more consistently 

In IAudioFlinger::createTrack() and IAudioFlinger::openRecord(),
declare input parameter to use correct type audio_channel_mask_t.

In IAudioFlinger::getInputBufferSize(), input parameter is now channel mask
instead of channel count.

Remove unused IAudioFlinger::channelCount(audio_io_handle_t).

In AudioRecord::getMinFrameCount() and AudioSystem::getInputBufferSize(),
input parameter is channel mask instead of channel count.

Change-Id: Ib2f1c29bea70f016b3cfce83942ba292190ac965
parent f1da96d8

include/media/AudioRecord.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public: 
     static status_t getMinFrameCount(int* frameCount,

                                      uint32_t sampleRate,

                                      audio_format_t format,

                                      int channelCount);

                                      audio_channel_mask_t channelMask);



    /* Constructs an uninitialized AudioRecord. No connection with

     * AudioFlinger takes place.

include/media/AudioSystem.h

+3 −3
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ public: 


    static bool routedToA2dpOutput(audio_stream_type_t streamType);



    static status_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount,

        size_t* buffSize);

    static status_t getInputBufferSize(uint32_t sampleRate, audio_format_t format,

        audio_channel_mask_t channelMask, size_t* buffSize);



    static status_t setVoiceVolume(float volume);
@@ -276,7 +276,7 @@ private: 
    // previous parameters for recording buffer size queries

    static uint32_t gPrevInSamplingRate;

    static audio_format_t gPrevInFormat;

    static int gPrevInChannelCount;

    static audio_channel_mask_t gPrevInChannelMask;



    static sp<IAudioPolicyService> gAudioPolicyService;

include/media/IAudioFlinger.h

+6 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public: 
                                audio_stream_type_t streamType,

                                uint32_t sampleRate,

                                audio_format_t format,

                                uint32_t channelMask,

                                audio_channel_mask_t channelMask,

                                int frameCount,

                                track_flags_t flags,

                                const sp<IMemory>& sharedBuffer,
@@ -74,7 +74,7 @@ public: 
                                audio_io_handle_t input,

                                uint32_t sampleRate,

                                audio_format_t format,

                                uint32_t channelMask,

                                audio_channel_mask_t channelMask,

                                int frameCount,

                                track_flags_t flags,

                                int *sessionId,
@@ -84,7 +84,9 @@ public: 
     * and therefore can be cached.

     */

    virtual     uint32_t    sampleRate(audio_io_handle_t output) const = 0;

#if 0

    virtual     int         channelCount(audio_io_handle_t output) const = 0;

#endif

    virtual     audio_format_t format(audio_io_handle_t output) const = 0;

    virtual     size_t      frameCount(audio_io_handle_t output) const = 0;
@@ -126,7 +128,8 @@ public: 
    virtual void registerClient(const sp<IAudioFlingerClient>& client) = 0;



    // retrieve the audio recording buffer size

    virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount) const = 0;

    virtual size_t getInputBufferSize(uint32_t sampleRate, audio_format_t format,

            audio_channel_mask_t channelMask) const = 0;



    virtual audio_io_handle_t openOutput(audio_module_handle_t module,

                                         audio_devices_t *pDevices,

media/libmedia/AudioRecord.cpp

+5 −4
Original line number Diff line number Diff line
@@ -39,18 +39,18 @@ status_t AudioRecord::getMinFrameCount( 
        int* frameCount,

        uint32_t sampleRate,

        audio_format_t format,

        int channelCount)

        audio_channel_mask_t channelMask)

{

    size_t size = 0;

    if (AudioSystem::getInputBufferSize(sampleRate, format, channelCount, &size)

    if (AudioSystem::getInputBufferSize(sampleRate, format, channelMask, &size)

            != NO_ERROR) {

        ALOGE("AudioSystem could not query the input buffer size.");

        return NO_INIT;

    }



    if (size == 0) {

        ALOGE("Unsupported configuration: sampleRate %d, format %d, channelCount %d",

            sampleRate, format, channelCount);

        ALOGE("Unsupported configuration: sampleRate %d, format %d, channelMask %#x",

            sampleRate, format, channelMask);

        return BAD_VALUE;

    }
@@ -58,6 +58,7 @@ status_t AudioRecord::getMinFrameCount( 
    size <<= 1;



    if (audio_is_linear_pcm(format)) {

        int channelCount = popcount(channelMask);

        size /= channelCount * audio_bytes_per_sample(format);

    }

media/libmedia/AudioSystem.cpp

+6 −6
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ DefaultKeyedVector<audio_io_handle_t, AudioSystem::OutputDescriptor *> AudioSyst 
// Cached values for recording queries, all protected by gLock

uint32_t AudioSystem::gPrevInSamplingRate = 16000;

audio_format_t AudioSystem::gPrevInFormat = AUDIO_FORMAT_PCM_16_BIT;

int AudioSystem::gPrevInChannelCount = 1;

audio_channel_mask_t AudioSystem::gPrevInChannelMask = AUDIO_CHANNEL_IN_MONO;

size_t AudioSystem::gInBuffSize = 0;
@@ -334,25 +334,25 @@ status_t AudioSystem::getLatency(audio_io_handle_t output, 
    return NO_ERROR;

}



status_t AudioSystem::getInputBufferSize(uint32_t sampleRate, audio_format_t format, int channelCount,

    size_t* buffSize)

status_t AudioSystem::getInputBufferSize(uint32_t sampleRate, audio_format_t format,

        audio_channel_mask_t channelMask, size_t* buffSize)

{

    gLock.lock();

    // Do we have a stale gInBufferSize or are we requesting the input buffer size for new values

    size_t inBuffSize = gInBuffSize;

    if ((inBuffSize == 0) || (sampleRate != gPrevInSamplingRate) || (format != gPrevInFormat)

        || (channelCount != gPrevInChannelCount)) {

        || (channelMask != gPrevInChannelMask)) {

        gLock.unlock();

        const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();

        if (af == 0) {

            return PERMISSION_DENIED;

        }

        inBuffSize = af->getInputBufferSize(sampleRate, format, channelCount);

        inBuffSize = af->getInputBufferSize(sampleRate, format, channelMask);

        gLock.lock();

        // save the request params

        gPrevInSamplingRate = sampleRate;

        gPrevInFormat = format;

        gPrevInChannelCount = channelCount;

        gPrevInChannelMask = channelMask;



        gInBuffSize = inBuffSize;

    }