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

Commit 7ad7a258 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

libaudioprocessing: Extract vendor-available part of AudioMixer 

Split AudioMixer into the base part which doesn't rely on
the framework and can be used in vendor code and the derived part
which is intended to be used by Audioflinger.

Test: A/B compare output from test scripts, manual testing on the phone
Change-Id: I24c390f67f20baa8109902099359ca6e34eebcfd
parent 3b73e994

media/audioserver/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libaaudioservice \

	libaudioflinger \

	libaudiopolicyservice \

	libaudioprocessing \

	libbinder \

	libcutils \

	liblog \

media/libaudioprocessing/Android.bp

+12 −8
Original line number Diff line number Diff line
@@ -3,16 +3,13 @@ cc_defaults { 


    export_include_dirs: ["include"],



    header_libs: ["libaudioclient_headers"],



    shared_libs: [

        "libaudioutils",

        "libcutils",

        "liblog",

        "libutils",

        "libvibrator",

    ],



    header_libs: [

        "libbase_headers",

    ],



    cflags: [
@@ -29,24 +26,31 @@ cc_library_shared { 
    defaults: ["libaudioprocessing_defaults"],



    srcs: [

        "AudioMixer.cpp",

        "BufferProviders.cpp",

        "RecordBufferConverter.cpp",

    ],



    header_libs: [

        "libbase_headers",

    ],



    shared_libs: [

        "libaudiohal",

        "libsonic",

        "libvibrator",

    ],



    whole_static_libs: ["libaudioprocessing_arm"],

    whole_static_libs: ["libaudioprocessing_base"],

}



cc_library_static {

    name: "libaudioprocessing_arm",

    name: "libaudioprocessing_base",

    defaults: ["libaudioprocessing_defaults"],

    vendor_available: true,



    srcs: [

        "AudioMixer.cpp",

        "AudioMixerBase.cpp",

        "AudioResampler.cpp",

        "AudioResamplerCubic.cpp",

        "AudioResamplerSinc.cpp",