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

Commit e49f2b42 authored by Eric Laurent's avatar Eric Laurent
Browse files

stagefright: fix AudioRecord callback buffer size 

Make sure that the maximum number of frames passed to
AudioSource by the AudioRecord callback always fits within
the maximum buffer size defined by kMaxBufferSize.

Also make sure that the total AudioRecord buffer size is more
than the minimum required.

Change-Id: I26a1f998e0cf75ac88b02e67ec9d8db3c0cca193
parent 10cf121f

media/libstagefright/AudioSource.cpp

+33 −13
Original line number Diff line number Diff line
@@ -56,6 +56,23 @@ AudioSource::AudioSource( 


    ALOGV("sampleRate: %d, channelCount: %d", sampleRate, channelCount);

    CHECK(channelCount == 1 || channelCount == 2);



    int minFrameCount;

    status_t status = AudioRecord::getMinFrameCount(&minFrameCount,

                                           sampleRate,

                                           AUDIO_FORMAT_PCM_16_BIT,

                                           channelCount);

    if (status == OK) {

        // make sure that the AudioRecord callback never returns more than the maximum

        // buffer size

        int frameCount = kMaxBufferSize / sizeof(int16_t) / channelCount;



        // make sure that the AudioRecord total buffer size is large enough

        int bufCount = 2;

        while ((bufCount * frameCount) < minFrameCount) {

            bufCount++;

        }



        AudioRecord::record_flags flags = (AudioRecord::record_flags)

                        (AudioRecord::RECORD_AGC_ENABLE |

                         AudioRecord::RECORD_NS_ENABLE  |
@@ -63,12 +80,15 @@ AudioSource::AudioSource( 
        mRecord = new AudioRecord(

                    inputSource, sampleRate, AUDIO_FORMAT_PCM_16_BIT,

                    audio_channel_in_mask_from_count(channelCount),

                4 * kMaxBufferSize / sizeof(int16_t), /* Enable ping-pong buffers */

                    bufCount * frameCount,

                    flags,

                    AudioRecordCallbackFunction,

                this);



                    this,

                    frameCount);

        mInitCheck = mRecord->initCheck();

    } else {

        mInitCheck = status;

    }

}



AudioSource::~AudioSource() {