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

Commit c31abe46 authored by Hayden Gomes's avatar Hayden Gomes Committed by Automerger Merge Worker
Browse files

Merge "Adding sanity checks for invalid frame sizes" into rvc-dev am:... 

Merge "Adding sanity checks for invalid frame sizes" into rvc-dev am: d36b1491 am: 810d9156 am: 9fc8fccc am: a476d2f4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11851234

Change-Id: Ifb531402bfc3a0b49a0299b3690afa70d81ce4e9
parents 04830d70 a476d2f4

services/audioflinger/AudioStreamOut.cpp

+4 −0
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ status_t AudioStreamOut::open( 
        stream = outStream;

        mHalFormatHasProportionalFrames = audio_has_proportional_frames(config->format);

        status = stream->getFrameSize(&mHalFrameSize);

        LOG_ALWAYS_FATAL_IF(status != OK, "Error retrieving frame size from HAL: %d", status);

        LOG_ALWAYS_FATAL_IF(mHalFrameSize <= 0, "Error frame size was %zu but must be greater than"

                " zero", mHalFrameSize);



    }



    return status;

services/audioflinger/Threads.cpp

+7 −4
Original line number Diff line number Diff line
@@ -8435,13 +8435,14 @@ void AudioFlinger::RecordThread::readInputParameters_l() 
    }

    result = mInput->stream->getFrameSize(&mFrameSize);

    LOG_ALWAYS_FATAL_IF(result != OK, "Error retrieving frame size from HAL: %d", result);

    LOG_ALWAYS_FATAL_IF(mFrameSize <= 0, "Error frame size was %zu but must be greater than zero",

            mFrameSize);

    result = mInput->stream->getBufferSize(&mBufferSize);

    LOG_ALWAYS_FATAL_IF(result != OK, "Error retrieving buffer size from HAL: %d", result);

    mFrameCount = mBufferSize / mFrameSize;

    ALOGV("%p RecordThread params: mChannelCount=%u, mFormat=%#x, mFrameSize=%lld, "

            "mBufferSize=%lld, mFrameCount=%lld",

            this, mChannelCount, mFormat, (long long)mFrameSize, (long long)mBufferSize,

            (long long)mFrameCount);

    ALOGV("%p RecordThread params: mChannelCount=%u, mFormat=%#x, mFrameSize=%zu, "

            "mBufferSize=%zu, mFrameCount=%zu",

            this, mChannelCount, mFormat, mFrameSize, mBufferSize, mFrameCount);

    // This is the formula for calculating the temporary buffer size.

    // With 7 HAL buffers, we can guarantee ability to down-sample the input by ratio of 6:1 to

    // 1 full output buffer, regardless of the alignment of the available input.
@@ -9017,6 +9018,8 @@ void AudioFlinger::MmapThread::readHalParameters_l() 
    LOG_ALWAYS_FATAL_IF(!audio_is_linear_pcm(mFormat), "HAL format %#x is not linear pcm", mFormat);

    result = mHalStream->getFrameSize(&mFrameSize);

    LOG_ALWAYS_FATAL_IF(result != OK, "Error retrieving frame size from HAL: %d", result);

    LOG_ALWAYS_FATAL_IF(mFrameSize <= 0, "Error frame size was %zu but must be greater than zero",

            mFrameSize);

    result = mHalStream->getBufferSize(&mBufferSize);

    LOG_ALWAYS_FATAL_IF(result != OK, "Error retrieving buffer size from HAL: %d", result);

    mFrameCount = mBufferSize / mFrameSize;