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

Commit bded9c8b authored by Andy Hung's avatar Andy Hung
Browse files

AudioEffect: rename m(In|Out)Buffer16 to m(In|Out)ConversionBuffer 

These buffers will be used later for channel conversion as well.

Test: Solo Tester
Bug: 69984406
Change-Id: I551a256d79793b4137b2689be1140d1d6e35ef71
parent cc25a713

services/audioflinger/Effects.cpp

+55 −60
Original line number Original line Diff line number Diff line
@@ -328,21 +328,21 @@ void AudioFlinger::EffectModule::process() 
            } else {

            } else {

                {   // convert input to int16_t as effect doesn't support float.

                {   // convert input to int16_t as effect doesn't support float.

                    if (!auxType) {

                    if (!auxType) {

                        if (mInBuffer16.get() == nullptr) {

                        if (mInConversionBuffer.get() == nullptr) {

                            ALOGW("%s: mInBuffer16 is null, bypassing", __func__);

                            ALOGW("%s: mInConversionBuffer is null, bypassing", __func__);

                            goto data_bypass;

                            goto data_bypass;

                        }

                        }

                        const float * const pIn = mInBuffer->audioBuffer()->f32;

                        const float * const pIn = mInBuffer->audioBuffer()->f32;

                        int16_t * const pIn16 = mInBuffer16->audioBuffer()->s16;

                        int16_t * const pIn16 = mInConversionBuffer->audioBuffer()->s16;

                        memcpy_to_i16_from_float(

                        memcpy_to_i16_from_float(

                                pIn16, pIn, inChannelCount * mConfig.inputCfg.buffer.frameCount);

                                pIn16, pIn, inChannelCount * mConfig.inputCfg.buffer.frameCount);

                    }

                    }

                    if (mConfig.outputCfg.accessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE) {

                    if (mConfig.outputCfg.accessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE) {

                        if (mOutBuffer16.get() == nullptr) {

                        if (mOutConversionBuffer.get() == nullptr) {

                            ALOGW("%s: mOutBuffer16 is null, bypassing", __func__);

                            ALOGW("%s: mOutConversionBuffer is null, bypassing", __func__);

                            goto data_bypass;

                            goto data_bypass;

                        }

                        }

                        int16_t * const pOut16 = mOutBuffer16->audioBuffer()->s16;

                        int16_t * const pOut16 = mOutConversionBuffer->audioBuffer()->s16;

                        const float * const pOut = mOutBuffer->audioBuffer()->f32;

                        const float * const pOut = mOutBuffer->audioBuffer()->f32;

                        memcpy_to_i16_from_float(

                        memcpy_to_i16_from_float(

                                pOut16,

                                pOut16,
@@ -354,7 +354,7 @@ void AudioFlinger::EffectModule::process() 
                ret = mEffectInterface->process();

                ret = mEffectInterface->process();





                {   // convert output back to float.

                {   // convert output back to float.

                    const int16_t * const pOut16 = mOutBuffer16->audioBuffer()->s16;

                    const int16_t * const pOut16 = mOutConversionBuffer->audioBuffer()->s16;

                    float * const pOut = mOutBuffer->audioBuffer()->f32;

                    float * const pOut = mOutBuffer->audioBuffer()->f32;

                    memcpy_to_float_from_i16(

                    memcpy_to_float_from_i16(

                            pOut, pOut16, outChannelCount * mConfig.outputCfg.buffer.frameCount);

                            pOut, pOut16, outChannelCount * mConfig.outputCfg.buffer.frameCount);
@@ -906,7 +906,7 @@ void AudioFlinger::EffectModule::setInBuffer(const sp<EffectBufferHalInterface>& 
    mEffectInterface->setInBuffer(buffer);

    mEffectInterface->setInBuffer(buffer);





#ifdef FLOAT_EFFECT_CHAIN

#ifdef FLOAT_EFFECT_CHAIN

    // aux effects do in place conversion to float - we don't allocate mInBuffer16 for them.

    // aux effects do in place conversion to float - we don't allocate mInConversionBuffer.

    // Theoretically insert effects can also do in-place conversions (destroying

    // Theoretically insert effects can also do in-place conversions (destroying

    // the original buffer) when the output buffer is identical to the input buffer,

    // the original buffer) when the output buffer is identical to the input buffer,

    // but we don't optimize for it here.

    // but we don't optimize for it here.
@@ -920,17 +920,18 @@ void AudioFlinger::EffectModule::setInBuffer(const sp<EffectBufferHalInterface>& 
        ALOGV("%s: setInBuffer updating for inChannels:%d inFrameCount:%zu total size:%zu",

        ALOGV("%s: setInBuffer updating for inChannels:%d inFrameCount:%zu total size:%zu",

                __func__, inChannels, inFrameCount, size);

                __func__, inChannels, inFrameCount, size);





        if (size > 0 && (mInBuffer16.get() == nullptr || size > mInBuffer16->getSize())) {

        if (size > 0 && (mInConversionBuffer.get() == nullptr

            mInBuffer16.clear();

                || size > mInConversionBuffer->getSize())) {

            ALOGV("%s: allocating mInBuffer16 %zu", __func__, size);

            mInConversionBuffer.clear();

            (void)EffectBufferHalInterface::allocate(size, &mInBuffer16);

            ALOGV("%s: allocating mInConversionBuffer %zu", __func__, size);

            (void)EffectBufferHalInterface::allocate(size, &mInConversionBuffer);

        }

        }

        if (mInBuffer16.get() != nullptr) {

        if (mInConversionBuffer.get() != nullptr) {

            // FIXME: confirm buffer has enough size.

            // FIXME: confirm buffer has enough size.

            mInBuffer16->setFrameCount(inFrameCount);

            mInConversionBuffer->setFrameCount(inFrameCount);

            mEffectInterface->setInBuffer(mInBuffer16);

            mEffectInterface->setInBuffer(mInConversionBuffer);

        } else if (size > 0) {

        } else if (size > 0) {

            ALOGE("%s cannot create mInBuffer16", __func__);

            ALOGE("%s cannot create mInConversionBuffer", __func__);

        }

        }

    }

    }

#endif

#endif
@@ -948,7 +949,7 @@ void AudioFlinger::EffectModule::setOutBuffer(const sp<EffectBufferHalInterface> 
    mEffectInterface->setOutBuffer(buffer);

    mEffectInterface->setOutBuffer(buffer);





#ifdef FLOAT_EFFECT_CHAIN

#ifdef FLOAT_EFFECT_CHAIN

    // Note: Any effect that does not accumulate does not need mOutBuffer16 and

    // Note: Any effect that does not accumulate does not need mOutConversionBuffer and

    // can do in-place conversion from int16_t to float.  We don't optimize here.

    // can do in-place conversion from int16_t to float.  We don't optimize here.

    if (!mSupportsFloat && mOutBuffer.get() != nullptr) {

    if (!mSupportsFloat && mOutBuffer.get() != nullptr) {

        const size_t outFrameCount = mConfig.outputCfg.buffer.frameCount;

        const size_t outFrameCount = mConfig.outputCfg.buffer.frameCount;
@@ -958,16 +959,17 @@ void AudioFlinger::EffectModule::setOutBuffer(const sp<EffectBufferHalInterface> 
        ALOGV("%s: setOutBuffer updating for outChannels:%d outFrameCount:%zu total size:%zu",

        ALOGV("%s: setOutBuffer updating for outChannels:%d outFrameCount:%zu total size:%zu",

                __func__, outChannels, outFrameCount, size);

                __func__, outChannels, outFrameCount, size);





        if (size > 0 && (mOutBuffer16.get() == nullptr || size > mOutBuffer16->getSize())) {

        if (size > 0 && (mOutConversionBuffer.get() == nullptr

            mOutBuffer16.clear();

                || size > mOutConversionBuffer->getSize())) {

            ALOGV("%s: allocating mOutBuffer16 %zu", __func__, size);

            mOutConversionBuffer.clear();

            (void)EffectBufferHalInterface::allocate(size, &mOutBuffer16);

            ALOGV("%s: allocating mOutConversionBuffer %zu", __func__, size);

            (void)EffectBufferHalInterface::allocate(size, &mOutConversionBuffer);

        }

        }

        if (mOutBuffer16.get() != nullptr) {

        if (mOutConversionBuffer.get() != nullptr) {

            mOutBuffer16->setFrameCount(outFrameCount);

            mOutConversionBuffer->setFrameCount(outFrameCount);

            mEffectInterface->setOutBuffer(mOutBuffer16);

            mEffectInterface->setOutBuffer(mOutConversionBuffer);

        } else if (size > 0) {

        } else if (size > 0) {

            ALOGE("%s cannot create mOutBuffer16", __func__);

            ALOGE("%s cannot create mOutConversionBuffer", __func__);

        }

        }

    }

    }

#endif

#endif
@@ -1241,6 +1243,20 @@ String8 effectFlagsToString(uint32_t flags) { 
    return s;

    return s;

}

}





static std::string dumpInOutBuffer(bool isInput, const sp<EffectBufferHalInterface> &buffer) {

    std::stringstream ss;



    if (buffer.get() == nullptr) {

        return "nullptr"; // make different than below

    } else if (buffer->externalData() != nullptr) {

        ss << (isInput ? buffer->externalData() : buffer->audioBuffer()->raw)

                << " -> "

                << (isInput ? buffer->audioBuffer()->raw : buffer->externalData());

    } else {

        ss << buffer->audioBuffer()->raw;

    }

    return ss.str();

}





void AudioFlinger::EffectModule::dump(int fd, const Vector<String16>& args __unused)

void AudioFlinger::EffectModule::dump(int fd, const Vector<String16>& args __unused)

{

{
@@ -1305,19 +1321,13 @@ void AudioFlinger::EffectModule::dump(int fd, const Vector<String16>& args __unu 
    result.append(buffer);

    result.append(buffer);





#ifdef FLOAT_EFFECT_CHAIN

#ifdef FLOAT_EFFECT_CHAIN

    if (!mSupportsFloat) {



        int16_t* pIn16 = mInBuffer16 != 0 ? mInBuffer16->audioBuffer()->s16 : NULL;

    result.appendFormat("\t\t- HAL buffers:\n"

        int16_t* pOut16 = mOutBuffer16 != 0 ? mOutBuffer16->audioBuffer()->s16 : NULL;

            "\t\t\tIn(%s) InConversion(%s) Out(%s) OutConversion(%s)\n",



            dumpInOutBuffer(true /* isInput */, mInBuffer).c_str(),

        result.append("\t\t- Float and int16 buffers\n");

            dumpInOutBuffer(true /* isInput */, mInConversionBuffer).c_str(),

        result.append("\t\t\tIn_float   In_int16   Out_float  Out_int16\n");

            dumpInOutBuffer(false /* isInput */, mOutBuffer).c_str(),

        snprintf(buffer, SIZE,"\t\t\t%p %p %p %p\n",

            dumpInOutBuffer(false /* isInput */, mOutConversionBuffer).c_str());

                mConfig.inputCfg.buffer.raw,

                pIn16,

                pOut16,

                mConfig.outputCfg.buffer.raw);

        result.append(buffer);

    }

#endif

#endif





    snprintf(buffer, SIZE, "\t\t%zu Clients:\n", mHandles.size());

    snprintf(buffer, SIZE, "\t\t%zu Clients:\n", mHandles.size());
@@ -2161,19 +2171,6 @@ void AudioFlinger::EffectChain::syncHalEffectsState() 
    }

    }

}

}





static void dumpInOutBuffer(

        char *dump, size_t dumpSize, bool isInput, EffectBufferHalInterface *buffer) {

    if (buffer == nullptr) {

        snprintf(dump, dumpSize, "%p", buffer);

    } else if (buffer->externalData() != nullptr) {

        snprintf(dump, dumpSize, "%p -> %p",

                isInput ? buffer->externalData() : buffer->audioBuffer()->raw,

                isInput ? buffer->audioBuffer()->raw : buffer->externalData());

    } else {

        snprintf(dump, dumpSize, "%p", buffer->audioBuffer()->raw);

    }

}



void AudioFlinger::EffectChain::dump(int fd, const Vector<String16>& args)

void AudioFlinger::EffectChain::dump(int fd, const Vector<String16>& args)

{

{

    const size_t SIZE = 256;

    const size_t SIZE = 256;
@@ -2191,15 +2188,13 @@ void AudioFlinger::EffectChain::dump(int fd, const Vector<String16>& args) 
            result.append("\tCould not lock mutex:\n");

            result.append("\tCould not lock mutex:\n");

        }

        }





        char inBufferStr[64], outBufferStr[64];

        const std::string inBufferStr = dumpInOutBuffer(true /* isInput */, mInBuffer);

        dumpInOutBuffer(inBufferStr, sizeof(inBufferStr), true, mInBuffer.get());

        const std::string outBufferStr = dumpInOutBuffer(false /* isInput */, mOutBuffer);

        dumpInOutBuffer(outBufferStr, sizeof(outBufferStr), false, mOutBuffer.get());

        result.appendFormat("\t%-*s%-*s   Active tracks:\n",

        snprintf(buffer, SIZE, "\t%-*s%-*s   Active tracks:\n",

                (int)inBufferStr.size(), "In buffer    ",

                (int)strlen(inBufferStr), "In buffer    ",

                (int)outBufferStr.size(), "Out buffer      ");

                (int)strlen(outBufferStr), "Out buffer      ");

        result.appendFormat("\t%s   %s   %d\n",

        result.append(buffer);

                inBufferStr.c_str(), outBufferStr.c_str(), mActiveTrackCnt);

        snprintf(buffer, SIZE, "\t%s   %s   %d\n", inBufferStr, outBufferStr, mActiveTrackCnt);

        result.append(buffer);

        write(fd, result.string(), result.size());

        write(fd, result.string(), result.size());





        for (size_t i = 0; i < numEffects; ++i) {

        for (size_t i = 0; i < numEffects; ++i) {

services/audioflinger/Effects.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -171,8 +171,8 @@ mutable Mutex mLock; // mutex for process, commands and handl 




#ifdef FLOAT_EFFECT_CHAIN

#ifdef FLOAT_EFFECT_CHAIN

    bool    mSupportsFloat;         // effect supports float processing

    bool    mSupportsFloat;         // effect supports float processing

    sp<EffectBufferHalInterface> mInBuffer16;  // Buffers for interacting with HAL at 16 bits

    sp<EffectBufferHalInterface> mInConversionBuffer;  // Buffers for HAL conversion if needed.

    sp<EffectBufferHalInterface> mOutBuffer16;

    sp<EffectBufferHalInterface> mOutConversionBuffer;

#endif

#endif

};

};