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

Commit 8d270a34 authored by Sadaf Ebrahimi's avatar Sadaf Ebrahimi Committed by Gerrit Code Review
Browse files

Merge "Add new namespace of pffft to make the upgrade work" into main

parents c9b2ac83 8dd42107

media/libaudioclient/tests/audioeffect_analyser.cpp

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

    std::ifstream fin(argsR.mDumpFileName, std::ios::in | std::ios::binary);

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

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

    fin.close();

    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

    // 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

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

    // samples).

    // samples).

    int rerouteOffset = kPrimeDurationInSec * kSamplingFrequency;

    int rerouteOffset = kPrimeDurationInSec * kSamplingFrequency;

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

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

                            PFFFT_FORWARD);

                            pffft::detail::PFFFT_FORWARD);

    pffft_destroy_setup(handle);

    pffft_destroy_setup(handle);

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

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

        auto k = binOffsets[i];

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

    generateMultiTone(centerFrequencies, kSamplingFrequency, kPlayBackDurationSec, kDefAmplitude,

                      input.data(), totalFrameCount);

                      input.data(), totalFrameCount);

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

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

    PFFFT_Setup* handle = pffft_new_setup(kNPointFFT, PFFFT_REAL);

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

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

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

                            pffft::detail::PFFFT_FORWARD);

    pffft_destroy_setup(handle);

    pffft_destroy_setup(handle);

    float inputMag[numBands];

    float inputMag[numBands];

    for (auto i = 0; i < numBands; i++) {

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

    generateMultiTone(testFrequencies, kSamplingFrequency, kPlayBackDurationSec, kDefAmplitude,

                      input.data(), totalFrameCount);

                      input.data(), totalFrameCount);

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

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

    PFFFT_Setup* handle = pffft_new_setup(kNPointFFT, PFFFT_REAL);

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

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

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

                            pffft::detail::PFFFT_FORWARD);

    pffft_destroy_setup(handle);

    pffft_destroy_setup(handle);

    float inputMag[testFrequencies.size()];

    float inputMag[testFrequencies.size()];

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

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