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

Commit 771ffb62 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge changes If9777099,I1057b3a2 

* changes:
  EffectDownmix: Fix float mode and enable
  AudioMixer: Accept a float downmixer
parents dac98a45 ed1172f6

media/libaudioprocessing/AudioMixer.cpp

+13 −8
Original line number Diff line number Diff line
@@ -302,15 +302,20 @@ status_t AudioMixer::Track::prepareForDownmix() 
    if (audio_channel_mask_get_representation(channelMask)

                == AUDIO_CHANNEL_REPRESENTATION_POSITION

            && DownmixerBufferProvider::isMultichannelCapable()) {

        mDownmixerBufferProvider.reset(new DownmixerBufferProvider(channelMask,

                mMixerChannelMask,

                AUDIO_FORMAT_PCM_16_BIT /* TODO: use mMixerInFormat, now only PCM 16 */,



        // Check if we have a float or int16 downmixer, in that order.

        for (const audio_format_t format : { AUDIO_FORMAT_PCM_FLOAT, AUDIO_FORMAT_PCM_16_BIT }) {

            mDownmixerBufferProvider.reset(new DownmixerBufferProvider(

                    channelMask, mMixerChannelMask,

                    format,

                    sampleRate, sessionId, kCopyBufferFrameCount));

        if (static_cast<DownmixerBufferProvider *>(mDownmixerBufferProvider.get())->isValid()) {

            mDownmixRequiresFormat = AUDIO_FORMAT_PCM_16_BIT; // PCM 16 bit required for downmix

            if (static_cast<DownmixerBufferProvider *>(mDownmixerBufferProvider.get())

                    ->isValid()) {

                mDownmixRequiresFormat = format;

                reconfigureBufferProviders();

                return NO_ERROR;

            }

        }

        // mDownmixerBufferProvider reset below.

    }

media/libeffects/downmix/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ cc_library_shared { 
    relative_install_path: "soundfx",



    cflags: [

        //"-DBUILD_FLOAT",

        "-DBUILD_FLOAT",

        "-fvisibility=hidden",

        "-Wall",

        "-Werror",

media/libeffects/downmix/EffectDownmix.c

+11 −9
Original line number Diff line number Diff line
@@ -31,10 +31,12 @@ 
// Do not submit with DOWNMIX_ALWAYS_USE_GENERIC_DOWNMIXER defined, strictly for testing

//#define DOWNMIX_ALWAYS_USE_GENERIC_DOWNMIXER 0



#define MINUS_3_DB_IN_Q19_12 2896 // -3dB = 0.707 * 2^12 = 2896



#ifdef BUILD_FLOAT

#define MINUS_3_DB_IN_FLOAT 0.70710678f // -3dB = 0.70710678f

const audio_format_t gTargetFormat = AUDIO_FORMAT_PCM_FLOAT;

#else

#define MINUS_3_DB_IN_Q19_12 2896 // -3dB = 0.707 * 2^12 = 2896

const audio_format_t gTargetFormat = AUDIO_FORMAT_PCM_16_BIT;

#endif



// subset of possible audio_channel_mask_t values, and AUDIO_CHANNEL_OUT_* renamed to CHANNEL_MASK_*
@@ -703,7 +705,7 @@ int Downmix_Init(downmix_module_t *pDwmModule) { 
    memset(&pDwmModule->context, 0, sizeof(downmix_object_t));



    pDwmModule->config.inputCfg.accessMode = EFFECT_BUFFER_ACCESS_READ;

    pDwmModule->config.inputCfg.format = AUDIO_FORMAT_PCM_16_BIT;

    pDwmModule->config.inputCfg.format = gTargetFormat;

    pDwmModule->config.inputCfg.channels = AUDIO_CHANNEL_OUT_7POINT1;

    pDwmModule->config.inputCfg.bufferProvider.getBuffer = NULL;

    pDwmModule->config.inputCfg.bufferProvider.releaseBuffer = NULL;
@@ -715,7 +717,7 @@ int Downmix_Init(downmix_module_t *pDwmModule) { 


    // set a default value for the access mode, but should be overwritten by caller

    pDwmModule->config.outputCfg.accessMode = EFFECT_BUFFER_ACCESS_ACCUMULATE;

    pDwmModule->config.outputCfg.format = AUDIO_FORMAT_PCM_16_BIT;

    pDwmModule->config.outputCfg.format = gTargetFormat;

    pDwmModule->config.outputCfg.channels = AUDIO_CHANNEL_OUT_STEREO;

    pDwmModule->config.outputCfg.bufferProvider.getBuffer = NULL;

    pDwmModule->config.outputCfg.bufferProvider.releaseBuffer = NULL;
@@ -762,8 +764,8 @@ int Downmix_Configure(downmix_module_t *pDwmModule, effect_config_t *pConfig, bo 
    // Check configuration compatibility with build options, and effect capabilities

    if (pConfig->inputCfg.samplingRate != pConfig->outputCfg.samplingRate

        || pConfig->outputCfg.channels != DOWNMIX_OUTPUT_CHANNELS

        || pConfig->inputCfg.format != AUDIO_FORMAT_PCM_16_BIT

        || pConfig->outputCfg.format != AUDIO_FORMAT_PCM_16_BIT) {

        || pConfig->inputCfg.format != gTargetFormat

        || pConfig->outputCfg.format != gTargetFormat) {

        ALOGE("Downmix_Configure error: invalid config");

        return -EINVAL;

    }
@@ -1185,8 +1187,8 @@ void Downmix_foldFrom7Point1(LVM_FLOAT *pSrc, LVM_FLOAT *pDst, size_t numFrames, 
    if (accumulate) {

        while (numFrames) {

            // centerPlusLfeContrib = FC(-3dB) + LFE(-3dB)

            centerPlusLfeContrib = (pSrc[2] * MINUS_3_DB_IN_Q19_12)

                    + (pSrc[3] * MINUS_3_DB_IN_Q19_12);

            centerPlusLfeContrib = (pSrc[2] * MINUS_3_DB_IN_FLOAT)

                    + (pSrc[3] * MINUS_3_DB_IN_FLOAT);

            // FL + centerPlusLfeContrib + SL + RL

            lt = pSrc[0] + centerPlusLfeContrib + pSrc[6] + pSrc[4];

            // FR + centerPlusLfeContrib + SR + RR