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

Commit 021697ad authored by Eric Laurent's avatar Eric Laurent
Browse files

Audio effects: lvm bundle wrapper update after first integration tests. 

Change-Id: I20cb55282833bd6e3a160e0dae1cc1fcb6b1ca30
parent 4782cdbb

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

+979 −671

File changed.

Preview size limit exceeded, changes collapsed.

media/libeffects/lvm/wrapper/Bundle/EffectBundle.h

+83 −58
Original line number Diff line number Diff line
@@ -27,18 +27,23 @@ extern "C" { 
#define FIVEBAND_NUMBANDS       5

#define MAX_NUM_BANDS           5

#define MAX_CALL_SIZE           256

//#define LVM_PCM



//TODO: this should be included from each effect API include

static const effect_uuid_t SL_IID_BASSBOOST_ = { 0x0634f220, 0xddd4, 0x11db, 0xa0fc, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };

static const effect_uuid_t SL_IID_BASSBOOST_ = { 0x0634f220, 0xddd4, 0x11db, 0xa0fc,

                                               { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };

const effect_uuid_t * const SL_IID_BASSBOOST = &SL_IID_BASSBOOST_;



static const effect_uuid_t SL_IID_EQUALIZER_ = { 0x0bed4300, 0xddd6, 0x11db, 0x8f34, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };

static const effect_uuid_t SL_IID_EQUALIZER_ = { 0x0bed4300, 0xddd6, 0x11db, 0x8f34,

                                               { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };

const effect_uuid_t * const SL_IID_EQUALIZER = &SL_IID_EQUALIZER_;



static const effect_uuid_t SL_IID_VIRTUALIZER_ = { 0x37cc2c00, 0xdddd, 0x11db, 0x8577, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }; // updated mon 28th june 2010

static const effect_uuid_t SL_IID_VIRTUALIZER_ = { 0x37cc2c00, 0xdddd, 0x11db, 0x8577,

                                                 { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };

const effect_uuid_t * const SL_IID_VIRTUALIZER = &SL_IID_VIRTUALIZER_;



static const effect_uuid_t SL_IID_VOLUME_ = { 0x09e8ede0, 0xddde, 0x11db, 0xb4f6, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }; // updated mon 28th june 2010

static const effect_uuid_t SL_IID_VOLUME_ = { 0x09e8ede0, 0xddde, 0x11db, 0xb4f6,

                                            { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };

const effect_uuid_t * const SL_IID_VOLUME = &SL_IID_VOLUME_;



typedef enum
@@ -65,7 +70,9 @@ struct BundledEffectContext{ 
    bool                            bVolumeEnabled;           /* Flag for Volume */

    bool                            bEqualizerEnabled;        /* Flag for EQ */

    bool                            bBassEnabled;             /* Flag for Bass */

    bool                            bBassTempDisabled;        /* Flag for Bass to be re-enabled */

    bool                            bVirtualizerEnabled;      /* Flag for Virtualizer */

    bool                            bVirtualizerTempDisabled; /* Flag for effect to be re-enabled */

    int                             NumberEffectsEnabled;     /* Effects in this session */

    int                             NumberEffectsCalled;      /* Effects called so far */

    // Saved parameters for each effect */
@@ -77,7 +84,15 @@ struct BundledEffectContext{ 
    int                             VirtStrengthSaved;        /* Conversion between Get/Set */

    // Volume

    int                             levelSaved;     /* for when mute is set, level must be saved */

    int                             positionSaved;

    bool                            bMuteEnabled;   /* Must store as mute = -96dB level */

    bool                            bStereoPositionEnabled;

    int                             frameCount;

    LVM_Fs_en                       SampleRate;

    #ifdef LVM_PCM

    FILE                            *PcmInPtr;

    FILE                            *PcmOutPtr;

    #endif

};



/* SessionContext : One session */
@@ -140,11 +155,10 @@ static const int PRESET_CUSTOM = -1; 


static const uint32_t bandFreqRange[FIVEBAND_NUMBANDS][2] = {

                                       {30000, 120000},

	{12000, 460000},

	{46000, 1800000},

	{180000, 7000000},

	{700000, 1}

	};

                                       {120001, 460000},

                                       {460001, 1800000},

                                       {1800001, 7000000},

                                       {7000001, 1}};



static const LVM_UINT16  EQNB_5BandPresetsFrequencies[] = {

                                       60,           /* Frequencies in Hz */
@@ -172,6 +186,18 @@ static const LVM_INT16 EQNB_5BandNormalPresets[] = { 
                                      -6, 4, 9, 4, -5,      /* Pop Preset */

                                       10, 6, -1, 8, 10};   /* Rock Preset */



static const LVM_INT16 EQNB_5BandSoftPresets[] = {

                                        3, 0, 0, 0, 3,      /* Normal Preset */

                                        5, 3, -2, 4, 4,     /* Classical Preset */

                                        6, 0, 2, 4, 1,      /* Dance Preset */

                                        0, 0, 0, 0, 0,      /* Flat Preset */

                                        3, 0, 0, 2, -1,     /* Folk Preset */

                                        4, 1, 9, 3, 0,      /* Heavy Metal Preset */

                                        5, 3, 0, 1, 3,      /* Hip Hop Preset */

                                        4, 2, -2, 2, 5,     /* Jazz Preset */

                                       -1, 2, 5, 1, -2,     /* Pop Preset */

                                        5, 3, -1, 3, 5};    /* Rock Preset */



static const PresetConfig gEqualizerPresets[] = {

                                        {"Normal"},

                                        {"Classical"},
@@ -182,8 +208,7 @@ static const PresetConfig gEqualizerPresets[] = { 
                                        {"Hip Hop"},

                                        {"Jazz"},

                                        {"Pop"},

    		{"Rock"}

    };

                                        {"Rock"}};



#if __cplusplus

}  // extern "C"