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

Commit a6f38cc3 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge "Fix crash in DownmixerBufferProvider"

parents 5a3b54df 2f607551

media/libaudiohal/EffectHalLocal.cpp

+10 −0
Original line number Diff line number Diff line
@@ -45,11 +45,21 @@ status_t EffectHalLocal::setOutBuffer(const sp<EffectBufferHalInterface>& buffer 
}



status_t EffectHalLocal::process() {

    if (mInBuffer == nullptr || mOutBuffer == nullptr) {

        ALOGE_IF(mInBuffer == nullptr, "Input buffer not set");

        ALOGE_IF(mOutBuffer == nullptr, "Output buffer not set");

        return NO_INIT;

    }

    return (*mHandle)->process(mHandle, mInBuffer->audioBuffer(), mOutBuffer->audioBuffer());

}



status_t EffectHalLocal::processReverse() {

    if ((*mHandle)->process_reverse != NULL) {

        if (mInBuffer == nullptr || mOutBuffer == nullptr) {

            ALOGE_IF(mInBuffer == nullptr, "Input buffer not set");

            ALOGE_IF(mOutBuffer == nullptr, "Output buffer not set");

            return NO_INIT;

        }

        return (*mHandle)->process_reverse(

                mHandle, mInBuffer->audioBuffer(), mOutBuffer->audioBuffer());

    } else {

media/libaudioprocessing/BufferProviders.cpp

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,8 @@ DownmixerBufferProvider::DownmixerBufferProvider( 
         mEffectsFactory.clear();

         return;

     }

     mDownmixInterface->setInBuffer(mInBuffer);

     mDownmixInterface->setOutBuffer(mOutBuffer);



     int cmdStatus;

     uint32_t replySize = sizeof(int);