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

Commit b83ccf29 authored by Eric Laurent's avatar Eric Laurent
Browse files

update makefile for test effect libraries 

Convert .mk makefile to .bp in test effect libraries
(media/libeffects/testlibs) and fix build errors.

Test: make
Change-Id: I53e90c86550ab2a1351335d355ebf8989571fb1d
parent 1e3f5710

media/libeffects/testlibs/Android.bp

0 → 100644
+77 −0
Original line number Diff line number Diff line 
// Test Reverb library

package {

    default_applicable_licenses: [

        "frameworks_av_media_libeffects_testlibs_license",

    ],

}



license {

    name: "frameworks_av_media_libeffects_testlibs_license",

    visibility: [":__subpackages__"],

    license_kinds: [

        "SPDX-license-identifier-Apache-2.0",

    ],

    license_text: [

        "NOTICE",

    ],

}



cc_library {

    name: "libreverbtest",

    host_supported: true,

    vendor: true,

    srcs: [

        "EffectReverb.c",

        "EffectsMath.c",

    ],



    shared_libs: [

        "libcutils",

        "liblog",

    ],



    relative_install_path: "soundfx",



    cflags: [

        "-fvisibility=hidden",

        "-Wall",

        "-Werror",

        "-Wno-address-of-packed-member",

    ],



    header_libs: [

        "libaudioeffects",

    ],

}



cc_library {

    name: "libequalizertest",

    host_supported: true,

    vendor: true,

    srcs: [

        "AudioBiquadFilter.cpp",

        "AudioCoefInterpolator.cpp",

        "AudioEqualizer.cpp",

        "AudioPeakingFilter.cpp",

        "AudioShelvingFilter.cpp",

        "EffectEqualizer.cpp",

        "EffectsMath.c",

    ],



    shared_libs: [

        "libcutils",

        "liblog",

    ],



    relative_install_path: "soundfx",



    cflags: [

        "-fvisibility=hidden",

        "-Wall",

        "-Werror",

    ],



    header_libs: [

        "libaudioeffects",

    ],

}

media/libeffects/testlibs/Android.mk_

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



# Test Reverb library

include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

	EffectReverb.c.arm \

	EffectsMath.c.arm



LOCAL_CFLAGS := -O2



LOCAL_SHARED_LIBRARIES := \

	libcutils \

	libdl



LOCAL_MODULE_RELATIVE_PATH := soundfx

LOCAL_MODULE := libreverbtest



LOCAL_C_INCLUDES := \

	$(call include-path-for, audio-effects) \

	$(call include-path-for, graphics corecg)



LOCAL_MODULE_TAGS := optional



include $(BUILD_SHARED_LIBRARY)



# Test Equalizer library

include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

	EffectsMath.c.arm \

	EffectEqualizer.cpp \

	AudioBiquadFilter.cpp.arm \

	AudioCoefInterpolator.cpp.arm \

	AudioPeakingFilter.cpp.arm \

	AudioShelvingFilter.cpp.arm \

	AudioEqualizer.cpp.arm



LOCAL_CFLAGS := -O2



LOCAL_SHARED_LIBRARIES := \

	libcutils \

	libdl



LOCAL_MODULE_RELATIVE_PATH := soundfx

LOCAL_MODULE := libequalizertest



LOCAL_C_INCLUDES := \

	$(call include-path-for, graphics corecg) \

	$(call include-path-for, audio-effects)



LOCAL_MODULE_TAGS := optional



include $(BUILD_SHARED_LIBRARY)

media/libeffects/testlibs/AudioEqualizer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <assert.h>

#include <stdlib.h>

#include <new>

#include <utils/Log.h>

#include <log/log.h>



#include "AudioEqualizer.h"

#include "AudioPeakingFilter.h"

media/libeffects/testlibs/AudioPeakingFilter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -87,9 +87,9 @@ void AudioPeakingFilter::setBandwidth(uint32_t cents) { 
void AudioPeakingFilter::commit(bool immediate) {

    audio_coef_t coefs[5];

    int intCoord[3] = {

        mFrequency >> FREQ_PRECISION_BITS,

        (int)(mFrequency >> FREQ_PRECISION_BITS),

        mGain >> GAIN_PRECISION_BITS,

        mBandwidth >> BANDWIDTH_PRECISION_BITS

        (int)(mBandwidth >> BANDWIDTH_PRECISION_BITS)

    };

    uint32_t fracCoord[3] = {

        mFrequency << (32 - FREQ_PRECISION_BITS),

media/libeffects/testlibs/AudioShelvingFilter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ void AudioShelvingFilter::setGain(int32_t millibel) { 
void AudioShelvingFilter::commit(bool immediate) {

    audio_coef_t coefs[5];

    int intCoord[2] = {

        mFrequency >> FREQ_PRECISION_BITS,

        mGain >> GAIN_PRECISION_BITS

        (int)(mFrequency >> FREQ_PRECISION_BITS),

        (int)(mGain >> GAIN_PRECISION_BITS)

    };

    uint32_t fracCoord[2] = {

        mFrequency << (32 - FREQ_PRECISION_BITS),