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

Commit 15c7247e authored by Eric Laurent's avatar Eric Laurent Committed by The Android Open Source Project
Browse files

AI 144053: Fix issue #1751242 A2DP playback fails first time: Invalid buffer... 

AI 144053: Fix issue #1751242 A2DP playback fails first time: Invalid buffer size: minFrameCount 10240, frameCount 4800
  The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger().
  The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it.
  BUG=1751242

Automated import of CL 144053
parent 3f6fc880

media/libmedia/AudioSystem.cpp

+17 −16
Original line number Diff line number Diff line
@@ -259,12 +259,11 @@ status_t AudioSystem::getOutputSamplingRate(int* samplingRate, int streamType) 
{

    int output = getOutput(streamType);

    

    if (gOutSamplingRate[output] == 0) {

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

        if (af == 0) return PERMISSION_DENIED;

        // gOutSamplingRate is updated by get_audio_flinger()

    }

    if (output == NUM_AUDIO_OUTPUT_TYPES) return PERMISSION_DENIED;



    // gOutSamplingRate[] is updated by getOutput() which calls get_audio_flinger()

    LOGV("getOutputSamplingRate() streamType %d, output %d, sampling rate %d", streamType, output, gOutSamplingRate[output]);

    

    *samplingRate = gOutSamplingRate[output];

    

    return NO_ERROR;
@@ -274,14 +273,13 @@ status_t AudioSystem::getOutputFrameCount(int* frameCount, int streamType) 
{

    int output = getOutput(streamType);



    if (gOutFrameCount[output] == 0) {

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

        if (af == 0) return PERMISSION_DENIED;

        // gOutFrameCount is updated by get_audio_flinger()

    }

    if (output == NUM_AUDIO_OUTPUT_TYPES) return PERMISSION_DENIED;



    // gOutFrameCount[] is updated by getOutput() which calls get_audio_flinger()

    LOGV("getOutputFrameCount() streamType %d, output %d, frame count %d", streamType, output, gOutFrameCount[output]);



    *frameCount = gOutFrameCount[output];

    

    return NO_ERROR;

}
@@ -289,11 +287,9 @@ status_t AudioSystem::getOutputLatency(uint32_t* latency, int streamType) 
{

    int output = getOutput(streamType);



    if (gOutLatency[output] == 0) {

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

        if (af == 0) return PERMISSION_DENIED;

        // gOutLatency is updated by get_audio_flinger()

    }

    if (output == NUM_AUDIO_OUTPUT_TYPES) return PERMISSION_DENIED;



    // gOutLatency[] is updated by getOutput() which calls get_audio_flinger()

    LOGV("getOutputLatency() streamType %d, output %d, latency %d", streamType, output, gOutLatency[output]);



    *latency = gOutLatency[output];
@@ -355,6 +351,11 @@ void AudioSystem::setErrorCallback(audio_error_callback cb) { 


int AudioSystem::getOutput(int streamType)

{   

    // make sure that gA2dpEnabled is valid by calling get_audio_flinger() which in turn 

    // will call gAudioFlinger->isA2dpEnabled()

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

    if (af == 0) return NUM_AUDIO_OUTPUT_TYPES;



    if (streamType == DEFAULT) {

        streamType = MUSIC;

    }