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

Commit 298eb79c authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "Remove modules that depended on webrtc_legacy" am: 308f2b28 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1521067

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I031cad3eb9b6870d2c5db4e12de33c15c3ba576b
parents f1a97ba9 308f2b28

media/libeffects/preprocessing/Android.bp

+0 −30
Original line number Diff line number Diff line 
// audio preprocessing wrapper

cc_library_shared {

    name: "libaudiopreprocessing_legacy",



    vendor: true,



    relative_install_path: "soundfx",



    srcs: ["PreProcessing.cpp"],



    shared_libs: [

        "libwebrtc_audio_preprocessing",

        "libspeexresampler",

        "libutils",

        "liblog",

    ],



    cflags: [

        "-DWEBRTC_POSIX",

        "-DWEBRTC_LEGACY",

        "-fvisibility=hidden",

        "-Wall",

        "-Werror",

    ],



    header_libs: [

        "libaudioeffects",

        "libhardware_headers",

    ],

}



cc_library_shared {

    name: "libaudiopreprocessing",

    vendor: true,

media/libeffects/preprocessing/PreProcessing.cpp

+0 −614

File changed.

Preview size limit exceeded, changes collapsed.

media/libeffects/preprocessing/benchmarks/Android.bp

+0 −27
Original line number Diff line number Diff line 
cc_benchmark {

    name: "preprocessing_legacy_benchmark",

    vendor: true,

    relative_install_path: "soundfx",

    srcs: ["preprocessing_benchmark.cpp"],

    shared_libs: [

        "libaudiopreprocessing_legacy",

        "libaudioutils",

        "liblog",

        "libutils",

        "libwebrtc_audio_preprocessing",

    ],

    cflags: [

        "-DWEBRTC_POSIX",

        "-DWEBRTC_LEGACY",

        "-fvisibility=default",

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

    header_libs: [

        "libaudioeffects",

        "libhardware_headers",

        "libwebrtc_absl_headers",

    ],

}



cc_benchmark {

    name: "preprocessing_benchmark",

    vendor: true,

media/libeffects/preprocessing/benchmarks/preprocessing_benchmark.cpp

+0 −6
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ 
#include <cstdlib>

#include <random>

#include <vector>

#ifndef WEBRTC_LEGACY

#include <audio_effects/effect_agc2.h>

#endif

#include <audio_effects/effect_ns.h>

#include <benchmark/benchmark.h>

#include <hardware/audio_effect.h>
@@ -76,10 +74,8 @@ constexpr effect_uuid_t kEffectUuids[] = { 
        {0xbb392ec0, 0x8d4d, 0x11e0, 0xa896, {0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b}},

        // ns  uuid

        {0xc06c8400, 0x8e06, 0x11e0, 0x9cb6, {0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b}},

#ifndef WEBRTC_LEGACY

        // agc2 uuid

        {0x89f38e65, 0xd4d2, 0x4d64, 0xad0e, {0x2b, 0x3e, 0x79, 0x9e, 0xa8, 0x86}},

#endif

};

constexpr size_t kNumEffectUuids = std::size(kEffectUuids);

constexpr audio_channel_mask_t kChMasks[] = {
@@ -93,9 +89,7 @@ enum PreProcId { 
    PREPROC_AGC,  // Automatic Gain Control

    PREPROC_AEC,  // Acoustic Echo Canceler

    PREPROC_NS,   // Noise Suppressor

#ifndef WEBRTC_LEGACY

    PREPROC_AGC2,  // Automatic Gain Control 2

#endif

    PREPROC_NUM_EFFECTS

};

media/libeffects/preprocessing/tests/Android.bp

+0 −32
Original line number Diff line number Diff line 
// audio preprocessing unit test

cc_test {

    name: "AudioPreProcessingLegacyTest",



    vendor: true,



    relative_install_path: "soundfx",



    srcs: ["PreProcessingTest.cpp"],



    shared_libs: [

        "libaudiopreprocessing_legacy",

        "libaudioutils",

        "liblog",

        "libutils",

        "libwebrtc_audio_preprocessing",

    ],



    cflags: [

        "-DWEBRTC_POSIX",

        "-DWEBRTC_LEGACY",

        "-fvisibility=default",

        "-Wall",

        "-Werror",

        "-Wextra",

    ],



    header_libs: [

        "libaudioeffects",

        "libhardware_headers",

    ],

}



cc_test {

    name: "AudioPreProcessingTest",