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

Commit 71bbaf6e authored by Andy Hung's avatar Andy Hung Committed by Gerrit Code Review
Browse files

Merge "lvm: Extend multichannel support to 24 channels"

parents d46a259d a458f10b

media/libeffects/lvm/lib/Common/lib/LVM_Types.h

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define LVM_TYPES_H



#include <stdint.h>



#include <system/audio.h>

/****************************************************************************************/

/*                                                                                      */

/*  definitions                                                                         */
@@ -82,7 +82,7 @@ typedef float LVM_FLOAT; /* single precision floating point */ 
#define EFFECT_BUFFER_FORMAT AUDIO_FORMAT_PCM_FLOAT

typedef float effect_buffer_t;



#define LVM_MAX_CHANNELS 8  // FCC_8

#define LVM_MAX_CHANNELS FCC_24



/****************************************************************************************/

/*                                                                                      */

media/libeffects/lvm/tests/build_and_run_all_unit_tests.sh

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ do 
    do

        for fs in ${fs_arr[*]}

        do

            for chMask in {0..22}

            for chMask in {0..38}

            do

                adb shell $testdir/lvmtest -i:$testdir/sinesweepraw.raw \

                    -o:$testdir/sinesweep_$((chMask))_$((fs)).raw -chMask:$chMask -fs:$fs $flags

media/libeffects/lvm/tests/build_and_run_all_unit_tests_reverb.sh

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ do 
        do

            for fs in ${fs_arr[*]}

            do

                for chMask in {0..22}

                for chMask in {0..38}

                do

                    adb shell $testdir/reverb_test \

                        --input $testdir/sinesweepraw.raw \

media/libeffects/lvm/tests/lvmtest.cpp

+17 −1
Original line number Diff line number Diff line
@@ -109,6 +109,22 @@ constexpr audio_channel_mask_t lvmConfigChMask[] = { 
        AUDIO_CHANNEL_OUT_5POINT1POINT2,

        AUDIO_CHANNEL_OUT_7POINT1,

        AUDIO_CHANNEL_INDEX_MASK_8,

        AUDIO_CHANNEL_INDEX_MASK_9,

        AUDIO_CHANNEL_INDEX_MASK_10,

        AUDIO_CHANNEL_INDEX_MASK_11,

        AUDIO_CHANNEL_INDEX_MASK_12,

        AUDIO_CHANNEL_INDEX_MASK_13,

        AUDIO_CHANNEL_INDEX_MASK_14,

        AUDIO_CHANNEL_INDEX_MASK_15,

        AUDIO_CHANNEL_INDEX_MASK_16,

        AUDIO_CHANNEL_INDEX_MASK_17,

        AUDIO_CHANNEL_INDEX_MASK_18,

        AUDIO_CHANNEL_INDEX_MASK_19,

        AUDIO_CHANNEL_INDEX_MASK_20,

        AUDIO_CHANNEL_INDEX_MASK_21,

        AUDIO_CHANNEL_INDEX_MASK_22,

        AUDIO_CHANNEL_INDEX_MASK_23,

        AUDIO_CHANNEL_INDEX_MASK_24,

};



void printUsage() {
@@ -394,7 +410,7 @@ int lvmControl(struct EffectContext* pContext, lvmConfigParams_t* plvmConfigPara 
        params->SourceFormat = LVM_MONO;

    } else if (params->NrChannels == 2) {

        params->SourceFormat = LVM_STEREO;

    } else if (params->NrChannels > 2 && params->NrChannels <= 8) {  // FCC_2 FCC_8

    } else if (params->NrChannels > FCC_2 && params->NrChannels <= FCC_24) {

        params->SourceFormat = LVM_MULTICHANNEL;

    } else {

        return -EINVAL;

media/libeffects/lvm/tests/reverb_test.cpp

+16 −0
Original line number Diff line number Diff line
@@ -94,6 +94,22 @@ constexpr audio_channel_mask_t kReverbConfigChMask[] = { 
        AUDIO_CHANNEL_OUT_5POINT1POINT2,

        AUDIO_CHANNEL_OUT_7POINT1,

        AUDIO_CHANNEL_INDEX_MASK_8,

        AUDIO_CHANNEL_INDEX_MASK_9,

        AUDIO_CHANNEL_INDEX_MASK_10,

        AUDIO_CHANNEL_INDEX_MASK_11,

        AUDIO_CHANNEL_INDEX_MASK_12,

        AUDIO_CHANNEL_INDEX_MASK_13,

        AUDIO_CHANNEL_INDEX_MASK_14,

        AUDIO_CHANNEL_INDEX_MASK_15,

        AUDIO_CHANNEL_INDEX_MASK_16,

        AUDIO_CHANNEL_INDEX_MASK_17,

        AUDIO_CHANNEL_INDEX_MASK_18,

        AUDIO_CHANNEL_INDEX_MASK_19,

        AUDIO_CHANNEL_INDEX_MASK_20,

        AUDIO_CHANNEL_INDEX_MASK_21,

        AUDIO_CHANNEL_INDEX_MASK_22,

        AUDIO_CHANNEL_INDEX_MASK_23,

        AUDIO_CHANNEL_INDEX_MASK_24,

};



constexpr int kReverbConfigChMaskCount = std::size(kReverbConfigChMask);