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

Commit f79297de authored by Sadaf Ebrahimi's avatar Sadaf Ebrahimi Committed by Automerger Merge Worker
Browse files

Merge "Add new namespace of pffft to make the upgrade work" into main am: 8d270a34 am: 6090b427 

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



Change-Id: Ifdeb9c88223cb12c4c74dcf8fba555d8ed2ed633
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9d88600 6090b427

media/libaudioclient/tests/audioeffect_analyser.cpp

+8 −6
Original line number Diff line number Diff line
@@ -217,13 +217,13 @@ void computeFilterGainsAtTones(float captureDuration, int nPointFft, std::vector 
    std::ifstream fin(argsR.mDumpFileName, std::ios::in | std::ios::binary);

    fin.read((char*)output.data(), totalFrameCount * sizeof(output[0]));

    fin.close();

    PFFFT_Setup* handle = pffft_new_setup(nPointFft, PFFFT_REAL);

    pffft::detail::PFFFT_Setup* handle = pffft_new_setup(nPointFft, pffft::detail::PFFFT_REAL);

    // ignore first few samples. This is to not analyse until audio track is re-routed to remote

    // submix source, also for the effect filter response to reach steady-state (priming / pruning

    // samples).

    int rerouteOffset = kPrimeDurationInSec * kSamplingFrequency;

    pffft_transform_ordered(handle, output.data() + rerouteOffset, fftOutput.data(), nullptr,

                            PFFFT_FORWARD);

                            pffft::detail::PFFFT_FORWARD);

    pffft_destroy_setup(handle);

    for (auto i = 0; i < binOffsets.size(); i++) {

        auto k = binOffsets[i];
@@ -296,8 +296,9 @@ TEST(AudioEffectTest, CheckEqualizerEffect) { 
    generateMultiTone(centerFrequencies, kSamplingFrequency, kPlayBackDurationSec, kDefAmplitude,

                      input.data(), totalFrameCount);

    auto fftInput = pffft::AlignedVector<float>(kNPointFFT);

    PFFFT_Setup* handle = pffft_new_setup(kNPointFFT, PFFFT_REAL);

    pffft_transform_ordered(handle, input.data(), fftInput.data(), nullptr, PFFFT_FORWARD);

    pffft::detail::PFFFT_Setup* handle = pffft_new_setup(kNPointFFT, pffft::detail::PFFFT_REAL);

    pffft_transform_ordered(handle, input.data(), fftInput.data(), nullptr,

                            pffft::detail::PFFFT_FORWARD);

    pffft_destroy_setup(handle);

    float inputMag[numBands];

    for (auto i = 0; i < numBands; i++) {
@@ -400,8 +401,9 @@ TEST(AudioEffectTest, CheckBassBoostEffect) { 
    generateMultiTone(testFrequencies, kSamplingFrequency, kPlayBackDurationSec, kDefAmplitude,

                      input.data(), totalFrameCount);

    auto fftInput = pffft::AlignedVector<float>(kNPointFFT);

    PFFFT_Setup* handle = pffft_new_setup(kNPointFFT, PFFFT_REAL);

    pffft_transform_ordered(handle, input.data(), fftInput.data(), nullptr, PFFFT_FORWARD);

    pffft::detail::PFFFT_Setup* handle = pffft_new_setup(kNPointFFT, pffft::detail::PFFFT_REAL);

    pffft_transform_ordered(handle, input.data(), fftInput.data(), nullptr,

                            pffft::detail::PFFFT_FORWARD);

    pffft_destroy_setup(handle);

    float inputMag[testFrequencies.size()];

    for (auto i = 0; i < testFrequencies.size(); i++) {