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

Commit 41af42b4 authored by Kevin Rocard's avatar Kevin Rocard Committed by Mikhail Naganov
Browse files

Effect factory: Test that the xml is correctly parsed 



Compare the dump after parsing with the reference dump.

Test: This is it
Bug: 37492580

Change-Id: I7dbbe2754f182a0f5818bdf9010d89ac6f0498e2
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent 4fb615c2

media/libeffects/factory/Android.bp

+21 −0
Original line number Diff line number Diff line
@@ -31,3 +31,24 @@ cc_library_shared { 
    header_libs: ["libeffects_headers"],

    export_header_lib_headers: ["libeffects_headers"],

}



cc_binary {

    name: "dumpEffectConfigFile",

    vendor: true,

    srcs: ["test/DumpConfig.cpp"],



    compile_multilib: "32",



    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

    ],





    shared_libs: [

        "libeffectsconfig",

        "libeffects",

    ],

    local_include_dirs:[".", "include"],

}

media/libeffects/factory/EffectsConfigLoader.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static lib_entry_t *getLibrary(const char *path); 


static lib_entry_t *gCachedLibrary;  // last library accessed by getLibrary()



int loadEffectConfig()

int EffectLoadEffectConfig()

{

    if (access(AUDIO_EFFECT_VENDOR_CONFIG_FILE, R_OK) == 0) {

        return loadEffectConfigFile(AUDIO_EFFECT_VENDOR_CONFIG_FILE);

media/libeffects/factory/EffectsConfigLoader.h

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef ANDROID_EFFECTSCONFIGLOADER_H

#define ANDROID_EFFECTSCONFIGLOADER_H



#include <cutils/compiler.h>

#include "EffectsFactoryState.h"



#ifdef  __cplusplus
@@ -26,7 +27,8 @@ extern "C" { 


/** Parses the platform effect configuration

 * and stores its content in the global EffectFactoryState. */

int loadEffectConfig();

ANDROID_API

int EffectLoadEffectConfig();





#ifdef  __cplusplus

media/libeffects/factory/EffectsFactory.c

+3 −3
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
#include <media/EffectsFactoryApi.h>



#include "EffectsConfigLoader.h"

#include "EffectsXmlConfigLoader.h"

#include "EffectsFactoryState.h"

#include "EffectsXmlConfigLoader.h"



#include "EffectsFactory.h"
@@ -437,10 +437,10 @@ int init() { 
    if (ignoreFxConfFiles) {

        ALOGI("Audio effects in configuration files will be ignored");

    } else {

        ssize_t loadResult = loadXmlEffectConfig(NULL);

        ssize_t loadResult = EffectLoadXmlEffectConfig(NULL);

        if (loadResult < 0) {

            ALOGW("Failed to load XML effect configuration, fallback to .conf");

            loadEffectConfig();

            EffectLoadEffectConfig();

        } else if (loadResult > 0) {

            ALOGE("Effect config is partially invalid, skipped %zd elements", loadResult);

        }

media/libeffects/factory/EffectsXmlConfigLoader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ size_t loadEffects(const Effects& effects, list_elem_t* libList, list_elem_t** s 
//      Interface function

/////////////////////////////////////////////////



extern "C" ssize_t loadXmlEffectConfig(const char* path)

extern "C" ssize_t EffectLoadXmlEffectConfig(const char* path)

{

    using effectsConfig::parse;

    auto result = path ? parse(path) : parse();