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

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

Merge changes I9446a1da,Id830e4b8 am: fd1ac15e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c5c4c8b8be5e4d7576f1132e52a83677742e896
parents 740ffe8c fd1ac15e

media/libeffects/lvm/tests/Android.bp

+31 −1
Original line number Diff line number Diff line
@@ -9,13 +9,43 @@ package { 
    default_applicable_licenses: ["frameworks_av_license"],

}



cc_test {

    name: "EffectReverbTest",

    vendor: true,

    gtest: true,

    host_supported: false,

    srcs: [

        "EffectReverbTest.cpp",

        "EffectTestHelper.cpp",

    ],

    include_dirs: [

        "frameworks/av/media/libeffects/lvm/lib/Common/lib",

        "frameworks/av/media/libeffects/lvm/wrapper/Reverb",

    ],

    static_libs: [

        "libaudioutils",

        "libreverb",

        "libreverbwrapper",

    ],

    shared_libs: [

        "liblog",

    ],

    header_libs: [

        "libaudioeffects",

        "libhardware_headers",

    ],

}



cc_test {

    name: "EffectBundleTest",

    vendor: true,

    gtest: true,

    host_supported: true,

    test_suites: ["device-tests"],

    srcs: ["EffectBundleTest.cpp"],

    srcs: [

        "EffectBundleTest.cpp",

        "EffectTestHelper.cpp",

    ],

    static_libs: [

        "libaudioutils",

        "libbundlewrapper",

media/libeffects/lvm/tests/EffectBundleTest.cpp

+32 −168
Original line number Diff line number Diff line
@@ -14,22 +14,8 @@ 
 * limitations under the License.

 */



#include <array>

#include <audio_utils/channels.h>

#include <audio_utils/primitives.h>

#include <climits>

#include <cstdlib>

#include <gtest/gtest.h>

#include <hardware/audio_effect.h>

#include <log/log.h>

#include <random>

#include <system/audio.h>

#include <vector>



extern audio_effect_library_t AUDIO_EFFECT_LIBRARY_INFO_SYM;



// Corresponds to SNR for 1 bit difference between two int16_t signals

constexpr float kSNRThreshold = 90.308998;

#include "EffectTestHelper.h"

using namespace android;



// Update isBassBoost, if the order of effects is updated

constexpr effect_uuid_t kEffectUuids[] = {
@@ -50,120 +36,15 @@ static bool isBassBoost(const effect_uuid_t* uuid) { 


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



constexpr audio_channel_mask_t kChMasks[] = {

        AUDIO_CHANNEL_OUT_MONO,          AUDIO_CHANNEL_OUT_STEREO,

        AUDIO_CHANNEL_OUT_2POINT1,       AUDIO_CHANNEL_OUT_2POINT0POINT2,

        AUDIO_CHANNEL_OUT_QUAD,          AUDIO_CHANNEL_OUT_QUAD_BACK,

        AUDIO_CHANNEL_OUT_QUAD_SIDE,     AUDIO_CHANNEL_OUT_SURROUND,

        AUDIO_CHANNEL_INDEX_MASK_4,      AUDIO_CHANNEL_OUT_2POINT1POINT2,

        AUDIO_CHANNEL_OUT_3POINT0POINT2, AUDIO_CHANNEL_OUT_PENTA,

        AUDIO_CHANNEL_INDEX_MASK_5,      AUDIO_CHANNEL_OUT_3POINT1POINT2,

        AUDIO_CHANNEL_OUT_5POINT1,       AUDIO_CHANNEL_OUT_5POINT1_BACK,

        AUDIO_CHANNEL_OUT_5POINT1_SIDE,  AUDIO_CHANNEL_INDEX_MASK_6,

        AUDIO_CHANNEL_OUT_6POINT1,       AUDIO_CHANNEL_INDEX_MASK_7,

        AUDIO_CHANNEL_OUT_5POINT1POINT2, AUDIO_CHANNEL_OUT_7POINT1,

        AUDIO_CHANNEL_INDEX_MASK_8,      AUDIO_CHANNEL_INDEX_MASK_9,

        AUDIO_CHANNEL_INDEX_MASK_10,     AUDIO_CHANNEL_INDEX_MASK_11,

        AUDIO_CHANNEL_INDEX_MASK_12,     AUDIO_CHANNEL_INDEX_MASK_13,

        AUDIO_CHANNEL_INDEX_MASK_14,     AUDIO_CHANNEL_INDEX_MASK_15,

        AUDIO_CHANNEL_INDEX_MASK_16,     AUDIO_CHANNEL_INDEX_MASK_17,

        AUDIO_CHANNEL_INDEX_MASK_18,     AUDIO_CHANNEL_INDEX_MASK_19,

        AUDIO_CHANNEL_INDEX_MASK_20,     AUDIO_CHANNEL_INDEX_MASK_21,

        AUDIO_CHANNEL_INDEX_MASK_22,     AUDIO_CHANNEL_INDEX_MASK_23,

        AUDIO_CHANNEL_INDEX_MASK_24,

};



constexpr size_t kNumChMasks = std::size(kChMasks);



constexpr size_t kSampleRates[] = {8000,  11025, 12000, 16000, 22050,  24000, 32000,

                                   44100, 48000, 88200, 96000, 176400, 192000};



constexpr size_t kNumSampleRates = std::size(kSampleRates);



constexpr size_t kFrameCounts[] = {4, 2048};



constexpr size_t kNumFrameCounts = std::size(kFrameCounts);



constexpr size_t kLoopCounts[] = {1, 4};



constexpr size_t kNumLoopCounts = std::size(kLoopCounts);



class EffectBundleHelper {

  public:

    EffectBundleHelper(const effect_uuid_t* uuid, size_t chMask, size_t sampleRate,

                       size_t frameCount, size_t loopCount)

        : mUuid(uuid),

          mChMask(chMask),

          mChannelCount(audio_channel_count_from_out_mask(mChMask)),

          mSampleRate(sampleRate),

          mFrameCount(frameCount),

          mLoopCount(loopCount) {}

    void createEffect();

    void releaseEffect();

    void configEffect();

    void process(float* input, float* output);



  private:

    const effect_uuid_t* mUuid;

    const size_t mChMask;

    const size_t mChannelCount;

    const size_t mSampleRate;

    const size_t mFrameCount;

    const size_t mLoopCount;

    effect_handle_t mEffectHandle{};

};



void EffectBundleHelper::createEffect() {

    int status = AUDIO_EFFECT_LIBRARY_INFO_SYM.create_effect(mUuid, 1, 1, &mEffectHandle);

    ASSERT_EQ(status, 0) << "create_effect returned an error " << status << "\n";

}



void EffectBundleHelper::releaseEffect() {

    int status = AUDIO_EFFECT_LIBRARY_INFO_SYM.release_effect(mEffectHandle);

    ASSERT_EQ(status, 0) << "release_effect returned an error " << status << "\n";

}



void EffectBundleHelper::configEffect() {

    effect_config_t config{};

    config.inputCfg.samplingRate = config.outputCfg.samplingRate = mSampleRate;

    config.inputCfg.channels = config.outputCfg.channels = mChMask;

    config.inputCfg.format = config.outputCfg.format = AUDIO_FORMAT_PCM_FLOAT;



    int reply = 0;

    uint32_t replySize = sizeof(reply);

    int status = (*mEffectHandle)

                         ->command(mEffectHandle, EFFECT_CMD_SET_CONFIG, sizeof(effect_config_t),

                                   &config, &replySize, &reply);

    ASSERT_EQ(status, 0) << "command returned an error " << status << "\n";

    ASSERT_EQ(reply, 0) << "command reply non zero " << reply << "\n";



    status = (*mEffectHandle)

                     ->command(mEffectHandle, EFFECT_CMD_ENABLE, 0, nullptr, &replySize, &reply);

    ASSERT_EQ(status, 0) << "command enable returned an error " << status << "\n";

    ASSERT_EQ(reply, 0) << "command reply non zero " << reply << "\n";

}



void EffectBundleHelper::process(float* input, float* output) {

    audio_buffer_t inBuffer = {.frameCount = mFrameCount, .f32 = input};

    audio_buffer_t outBuffer = {.frameCount = mFrameCount, .f32 = output};

    for (size_t i = 0; i < mLoopCount; i++) {

        int status = (*mEffectHandle)->process(mEffectHandle, &inBuffer, &outBuffer);

        ASSERT_EQ(status, 0) << "process returned an error " << status << "\n";



        inBuffer.f32 += mFrameCount * mChannelCount;

        outBuffer.f32 += mFrameCount * mChannelCount;

    }

}



typedef std::tuple<int, int, int, int, int> SingleEffectTestParam;

class SingleEffectTest : public ::testing::TestWithParam<SingleEffectTestParam> {

  public:

    SingleEffectTest()

        : mChMask(kChMasks[std::get<0>(GetParam())]),

        : mChMask(EffectTestHelper::kChMasks[std::get<0>(GetParam())]),

          mChannelCount(audio_channel_count_from_out_mask(mChMask)),

          mSampleRate(kSampleRates[std::get<1>(GetParam())]),

          mFrameCount(kFrameCounts[std::get<2>(GetParam())]),

          mLoopCount(kLoopCounts[std::get<3>(GetParam())]),

          mSampleRate(EffectTestHelper::kSampleRates[std::get<1>(GetParam())]),

          mFrameCount(EffectTestHelper::kFrameCounts[std::get<2>(GetParam())]),

          mLoopCount(EffectTestHelper::kLoopCounts[std::get<3>(GetParam())]),

          mTotalFrameCount(mFrameCount * mLoopCount),

          mUuid(&kEffectUuids[std::get<4>(GetParam())]) {}
@@ -182,10 +63,10 @@ TEST_P(SingleEffectTest, SimpleProcess) { 
                 << "chMask: " << mChMask << " sampleRate: " << mSampleRate

                 << " frameCount: " << mFrameCount << " loopCount: " << mLoopCount);



    EffectBundleHelper effect(mUuid, mChMask, mSampleRate, mFrameCount, mLoopCount);

    EffectTestHelper effect(mUuid, mChMask, mChMask, mSampleRate, mFrameCount, mLoopCount);



    ASSERT_NO_FATAL_FAILURE(effect.createEffect());

    ASSERT_NO_FATAL_FAILURE(effect.configEffect());

    ASSERT_NO_FATAL_FAILURE(effect.setConfig());



    // Initialize input buffer with deterministic pseudo-random values

    std::vector<float> input(mTotalFrameCount * mChannelCount);
@@ -199,11 +80,12 @@ TEST_P(SingleEffectTest, SimpleProcess) { 
    ASSERT_NO_FATAL_FAILURE(effect.releaseEffect());

}



INSTANTIATE_TEST_SUITE_P(EffectBundleTestAll, SingleEffectTest,

                         ::testing::Combine(::testing::Range(0, (int)kNumChMasks),

                                            ::testing::Range(0, (int)kNumSampleRates),

                                            ::testing::Range(0, (int)kNumFrameCounts),

                                            ::testing::Range(0, (int)kNumLoopCounts),

INSTANTIATE_TEST_SUITE_P(

        EffectBundleTestAll, SingleEffectTest,

        ::testing::Combine(::testing::Range(0, (int)EffectTestHelper::kNumChMasks),

                           ::testing::Range(0, (int)EffectTestHelper::kNumSampleRates),

                           ::testing::Range(0, (int)EffectTestHelper::kNumFrameCounts),

                           ::testing::Range(0, (int)EffectTestHelper::kNumLoopCounts),

                           ::testing::Range(0, (int)kNumEffectUuids)));



typedef std::tuple<int, int, int, int> SingleEffectComparisonTestParam;
@@ -211,9 +93,9 @@ class SingleEffectComparisonTest 
    : public ::testing::TestWithParam<SingleEffectComparisonTestParam> {

  public:

    SingleEffectComparisonTest()

        : mSampleRate(kSampleRates[std::get<0>(GetParam())]),

          mFrameCount(kFrameCounts[std::get<1>(GetParam())]),

          mLoopCount(kLoopCounts[std::get<2>(GetParam())]),

        : mSampleRate(EffectTestHelper::kSampleRates[std::get<0>(GetParam())]),

          mFrameCount(EffectTestHelper::kFrameCounts[std::get<1>(GetParam())]),

          mLoopCount(EffectTestHelper::kLoopCounts[std::get<2>(GetParam())]),

          mTotalFrameCount(mFrameCount * mLoopCount),

          mUuid(&kEffectUuids[std::get<3>(GetParam())]) {}
@@ -224,26 +106,6 @@ class SingleEffectComparisonTest 
    const effect_uuid_t* mUuid;

};



template <typename T>

float computeSnr(const T* ref, const T* tst, size_t count) {

    double signal{};

    double noise{};



    for (size_t i = 0; i < count; ++i) {

        const double value(ref[i]);

        const double diff(tst[i] - value);

        signal += value * value;

        noise += diff * diff;

    }

    // Initialized to a value greater than kSNRThreshold to handle

    // cases where ref and tst match exactly

    float snr = kSNRThreshold + 1.0f;

    if (signal > 0.0f && noise > 0.0f) {

        snr = 10.f * log(signal / noise);

    }

    return snr;

}



// Compares first two channels in multi-channel output to stereo output when same effect is applied

TEST_P(SingleEffectComparisonTest, SimpleProcess) {

    SCOPED_TRACE(testing::Message() << " sampleRate: " << mSampleRate << " frameCount: "
@@ -264,11 +126,11 @@ TEST_P(SingleEffectComparisonTest, SimpleProcess) { 
                    mTotalFrameCount * sizeof(float) * FCC_1);



    // Apply effect on stereo channels

    EffectBundleHelper stereoEffect(mUuid, AUDIO_CHANNEL_OUT_STEREO, mSampleRate, mFrameCount,

                                    mLoopCount);

    EffectTestHelper stereoEffect(mUuid, AUDIO_CHANNEL_OUT_STEREO, AUDIO_CHANNEL_OUT_STEREO,

                                  mSampleRate, mFrameCount, mLoopCount);



    ASSERT_NO_FATAL_FAILURE(stereoEffect.createEffect());

    ASSERT_NO_FATAL_FAILURE(stereoEffect.configEffect());

    ASSERT_NO_FATAL_FAILURE(stereoEffect.setConfig());



    std::vector<float> stereoOutput(mTotalFrameCount * FCC_2);

    ASSERT_NO_FATAL_FAILURE(stereoEffect.process(stereoInput.data(), stereoOutput.data()));
@@ -278,12 +140,12 @@ TEST_P(SingleEffectComparisonTest, SimpleProcess) { 
    std::vector<int16_t> stereoRefI16(mTotalFrameCount * FCC_2);

    memcpy_to_i16_from_float(stereoRefI16.data(), stereoOutput.data(), mTotalFrameCount * FCC_2);



    for (size_t chMask : kChMasks) {

    for (size_t chMask : EffectTestHelper::kChMasks) {

        size_t channelCount = audio_channel_count_from_out_mask(chMask);

        EffectBundleHelper testEffect(mUuid, chMask, mSampleRate, mFrameCount, mLoopCount);

        EffectTestHelper testEffect(mUuid, chMask, chMask, mSampleRate, mFrameCount, mLoopCount);



        ASSERT_NO_FATAL_FAILURE(testEffect.createEffect());

        ASSERT_NO_FATAL_FAILURE(testEffect.configEffect());

        ASSERT_NO_FATAL_FAILURE(testEffect.setConfig());



        std::vector<float> testInput(mTotalFrameCount * channelCount);
@@ -312,7 +174,8 @@ TEST_P(SingleEffectComparisonTest, SimpleProcess) { 
            // SNR must be above the threshold

            float snr = computeSnr<int16_t>(stereoRefI16.data(), stereoTestI16.data(),

                                            mTotalFrameCount * FCC_2);

            ASSERT_GT(snr, kSNRThreshold) << "SNR " << snr << "is lower than " << kSNRThreshold;

            ASSERT_GT(snr, EffectTestHelper::kSNRThreshold)

                    << "SNR " << snr << "is lower than " << EffectTestHelper::kSNRThreshold;

        } else {

            ASSERT_EQ(0,

                      memcmp(stereoRefI16.data(), stereoTestI16.data(), mTotalFrameCount * FCC_2))
@@ -321,10 +184,11 @@ TEST_P(SingleEffectComparisonTest, SimpleProcess) { 
    }

}



INSTANTIATE_TEST_SUITE_P(EffectBundleTestAll, SingleEffectComparisonTest,

                         ::testing::Combine(::testing::Range(0, (int)kNumSampleRates),

                                            ::testing::Range(0, (int)kNumFrameCounts),

                                            ::testing::Range(0, (int)kNumLoopCounts),

INSTANTIATE_TEST_SUITE_P(

        EffectBundleTestAll, SingleEffectComparisonTest,

        ::testing::Combine(::testing::Range(0, (int)EffectTestHelper::kNumSampleRates),

                           ::testing::Range(0, (int)EffectTestHelper::kNumFrameCounts),

                           ::testing::Range(0, (int)EffectTestHelper::kNumLoopCounts),

                           ::testing::Range(0, (int)kNumEffectUuids)));



int main(int argc, char** argv) {

media/libeffects/lvm/tests/EffectReverbTest.cpp

0 → 100644
+239 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <audio_effects/effect_presetreverb.h>

#include <VectorArithmetic.h>



#include "EffectTestHelper.h"

using namespace android;



constexpr effect_uuid_t kEffectUuids[] = {

        // NXP SW insert environmental reverb

        {0xc7a511a0, 0xa3bb, 0x11df, 0x860e, {0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b}},

        // NXP SW insert preset reverb

        {0x172cdf00, 0xa3bc, 0x11df, 0xa72f, {0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b}},

        // NXP SW auxiliary environmental reverb

        {0x4a387fc0, 0x8ab3, 0x11df, 0x8bad, {0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b}},

        // NXP SW auxiliary preset reverb

        {0xf29a1400, 0xa3bb, 0x11df, 0x8ddc, {0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b}},

};



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



static bool isAuxMode(const effect_uuid_t* uuid) {

    // Update this, if the order of effects in kEffectUuids is updated

    return (uuid == &kEffectUuids[2] || uuid == &kEffectUuids[3]);

}



constexpr int kPresets[] = {

        REVERB_PRESET_NONE,      REVERB_PRESET_SMALLROOM,  REVERB_PRESET_MEDIUMROOM,

        REVERB_PRESET_LARGEROOM, REVERB_PRESET_MEDIUMHALL, REVERB_PRESET_LARGEHALL,

        REVERB_PRESET_PLATE,

};



constexpr size_t kNumPresets = std::size(kPresets);



typedef std::tuple<int, int, int, int, int, int> SingleEffectTestParam;

class SingleEffectTest : public ::testing::TestWithParam<SingleEffectTestParam> {

  public:

    SingleEffectTest()

        : mSampleRate(EffectTestHelper::kSampleRates[std::get<1>(GetParam())]),

          mFrameCount(EffectTestHelper::kFrameCounts[std::get<2>(GetParam())]),

          mLoopCount(EffectTestHelper::kLoopCounts[std::get<3>(GetParam())]),

          mTotalFrameCount(mFrameCount * mLoopCount),

          mUuid(&kEffectUuids[std::get<4>(GetParam())]),

          mInChMask(isAuxMode(mUuid) ? AUDIO_CHANNEL_OUT_MONO

                                     : EffectTestHelper::kChMasks[std::get<0>(GetParam())]),

          mInChannelCount(audio_channel_count_from_out_mask(mInChMask)),

          mOutChMask(EffectTestHelper::kChMasks[std::get<0>(GetParam())]),

          mOutChannelCount(audio_channel_count_from_out_mask(mOutChMask)),

          mPreset(kPresets[std::get<5>(GetParam())]) {}



    const size_t mSampleRate;

    const size_t mFrameCount;

    const size_t mLoopCount;

    const size_t mTotalFrameCount;

    const effect_uuid_t* mUuid;

    const size_t mInChMask;

    const size_t mInChannelCount;

    const size_t mOutChMask;

    const size_t mOutChannelCount;

    const size_t mPreset;

};



// Tests applying a single effect

TEST_P(SingleEffectTest, SimpleProcess) {

    SCOPED_TRACE(testing::Message() << "outChMask: " << mOutChMask << " sampleRate: " << mSampleRate

                                    << " frameCount: " << mFrameCount

                                    << " loopCount: " << mLoopCount << " preset: " << mPreset);



    EffectTestHelper effect(mUuid, mInChMask, mOutChMask, mSampleRate, mFrameCount, mLoopCount);



    ASSERT_NO_FATAL_FAILURE(effect.createEffect());

    ASSERT_NO_FATAL_FAILURE(effect.setConfig());

    ASSERT_NO_FATAL_FAILURE(effect.setParam(REVERB_PARAM_PRESET, mPreset));



    // Initialize input buffer with deterministic pseudo-random values

    std::vector<float> input(mTotalFrameCount * mInChannelCount);

    std::vector<float> output(mTotalFrameCount * mOutChannelCount);

    std::minstd_rand gen(mOutChMask);

    std::uniform_real_distribution<> dis(-1.0f, 1.0f);

    for (auto& in : input) {

        in = dis(gen);

    }

    ASSERT_NO_FATAL_FAILURE(effect.process(input.data(), output.data()));

    ASSERT_NO_FATAL_FAILURE(effect.releaseEffect());

}



INSTANTIATE_TEST_SUITE_P(

        EffectReverbTestAll, SingleEffectTest,

        ::testing::Combine(::testing::Range(0, (int)EffectTestHelper::kNumChMasks),

                           ::testing::Range(0, (int)EffectTestHelper::kNumSampleRates),

                           ::testing::Range(0, (int)EffectTestHelper::kNumFrameCounts),

                           ::testing::Range(0, (int)EffectTestHelper::kNumLoopCounts),

                           ::testing::Range(0, (int)kNumEffectUuids),

                           ::testing::Range(0, (int)kNumPresets)));



typedef std::tuple<int, int, int, int, int> SingleEffectComparisonTestParam;

class SingleEffectComparisonTest

    : public ::testing::TestWithParam<SingleEffectComparisonTestParam> {

  public:

    SingleEffectComparisonTest()

        : mSampleRate(EffectTestHelper::kSampleRates[std::get<0>(GetParam())]),

          mFrameCount(EffectTestHelper::kFrameCounts[std::get<1>(GetParam())]),

          mLoopCount(EffectTestHelper::kLoopCounts[std::get<2>(GetParam())]),

          mTotalFrameCount(mFrameCount * mLoopCount),

          mUuid(&kEffectUuids[std::get<3>(GetParam())]),

          mPreset(kPresets[std::get<4>(GetParam())]) {}



    const size_t mSampleRate;

    const size_t mFrameCount;

    const size_t mLoopCount;

    const size_t mTotalFrameCount;

    const effect_uuid_t* mUuid;

    const size_t mPreset;

};



// Compares first two channels in multi-channel output to stereo output when same effect is applied

TEST_P(SingleEffectComparisonTest, SimpleProcess) {

    SCOPED_TRACE(testing::Message()

                 << " sampleRate: " << mSampleRate << " frameCount: " << mFrameCount

                 << " loopCount: " << mLoopCount << " preset: " << mPreset);



    // Initialize mono input buffer with deterministic pseudo-random values

    std::vector<float> monoInput(mTotalFrameCount);



    std::minstd_rand gen(mSampleRate);

    std::uniform_real_distribution<> dis(-1.0f, 1.0f);

    for (auto& in : monoInput) {

        in = dis(gen);

    }



    // Generate stereo by repeating mono channel data

    std::vector<float> stereoInput(mTotalFrameCount * FCC_2);

    adjust_channels(monoInput.data(), FCC_1, stereoInput.data(), FCC_2, sizeof(float),

                    mTotalFrameCount * sizeof(float) * FCC_1);



    // Apply effect on stereo channels

    EffectTestHelper stereoEffect(

            mUuid, isAuxMode(mUuid) ? AUDIO_CHANNEL_OUT_MONO : AUDIO_CHANNEL_OUT_STEREO,

            AUDIO_CHANNEL_OUT_STEREO, mSampleRate, mFrameCount, mLoopCount);



    ASSERT_NO_FATAL_FAILURE(stereoEffect.createEffect());

    ASSERT_NO_FATAL_FAILURE(stereoEffect.setConfig());

    ASSERT_NO_FATAL_FAILURE(stereoEffect.setParam(REVERB_PARAM_PRESET, mPreset));



    std::vector<float> stereoOutput(mTotalFrameCount * FCC_2);

    ASSERT_NO_FATAL_FAILURE(stereoEffect.process(

            (isAuxMode(mUuid) ? monoInput.data() : stereoInput.data()), stereoOutput.data()));

    ASSERT_NO_FATAL_FAILURE(stereoEffect.releaseEffect());



    // Average of both channels data is stored for mono comparison

    std::vector<float> monoOutput(mTotalFrameCount);

    From2iToMono_Float((const float*)stereoOutput.data(), monoOutput.data(), mTotalFrameCount);



    // Convert stereo float data to stereo int16_t to be used as reference

    std::vector<int16_t> stereoRefI16(mTotalFrameCount * FCC_2);

    memcpy_to_i16_from_float(stereoRefI16.data(), stereoOutput.data(), mTotalFrameCount * FCC_2);



    // mono int16_t to be used as refernece for mono comparison

    std::vector<int16_t> monoRefI16(mTotalFrameCount);

    memcpy_to_i16_from_float(monoRefI16.data(), monoOutput.data(), mTotalFrameCount);



    for (size_t outChMask : EffectTestHelper::kChMasks) {

        size_t outChannelCount = audio_channel_count_from_out_mask(outChMask);

        size_t inChMask = isAuxMode(mUuid) ? AUDIO_CHANNEL_OUT_MONO : outChMask;



        EffectTestHelper testEffect(mUuid, inChMask, outChMask, mSampleRate, mFrameCount,

                                    mLoopCount);



        ASSERT_NO_FATAL_FAILURE(testEffect.createEffect());

        ASSERT_NO_FATAL_FAILURE(testEffect.setConfig());

        ASSERT_NO_FATAL_FAILURE(testEffect.setParam(REVERB_PARAM_PRESET, mPreset));



        std::vector<float> testInput(mTotalFrameCount * outChannelCount);



        // Repeat mono channel data to all the channels

        // adjust_channels() zero fills channels > 2, hence can't be used here

        for (size_t i = 0; i < mTotalFrameCount; ++i) {

            auto* fp = &testInput[i * outChannelCount];

            std::fill(fp, fp + outChannelCount, monoInput[i]);

        }



        std::vector<float> testOutput(mTotalFrameCount * outChannelCount);

        ASSERT_NO_FATAL_FAILURE(testEffect.process(

                (isAuxMode(mUuid) ? monoInput.data() : testInput.data()), testOutput.data()));

        ASSERT_NO_FATAL_FAILURE(testEffect.releaseEffect());



        if (outChannelCount == FCC_1) {

            // Convert the test data to int16_t

            std::vector<int16_t> monoTestI16(mTotalFrameCount);

            memcpy_to_i16_from_float(monoTestI16.data(), testOutput.data(), mTotalFrameCount);



            ASSERT_EQ(0, memcmp(monoRefI16.data(), monoTestI16.data(), mTotalFrameCount * FCC_2))

                    << "Mono channel do not match with reference output \n";

        } else {

            // Extract first two channels

            std::vector<float> stereoTestOutput(mTotalFrameCount * FCC_2);

            adjust_channels(testOutput.data(), outChannelCount, stereoTestOutput.data(), FCC_2,

                            sizeof(float), mTotalFrameCount * sizeof(float) * outChannelCount);



            // Convert the test data to int16_t

            std::vector<int16_t> stereoTestI16(mTotalFrameCount * FCC_2);

            memcpy_to_i16_from_float(stereoTestI16.data(), stereoTestOutput.data(),

                                     mTotalFrameCount * FCC_2);



            ASSERT_EQ(0,

                      memcmp(stereoRefI16.data(), stereoTestI16.data(), mTotalFrameCount * FCC_2))

                    << "First two channels do not match with stereo output \n";

        }

    }

}



INSTANTIATE_TEST_SUITE_P(

        EffectReverbTestAll, SingleEffectComparisonTest,

        ::testing::Combine(::testing::Range(0, (int)EffectTestHelper::kNumSampleRates),

                           ::testing::Range(0, (int)EffectTestHelper::kNumFrameCounts),

                           ::testing::Range(0, (int)EffectTestHelper::kNumLoopCounts),

                           ::testing::Range(0, (int)kNumEffectUuids),

                           ::testing::Range(0, (int)kNumPresets)));



int main(int argc, char** argv) {

    ::testing::InitGoogleTest(&argc, argv);

    int status = RUN_ALL_TESTS();

    ALOGV("Test result = %d\n", status);

    return status;

}

media/libeffects/lvm/tests/EffectTestHelper.cpp

0 → 100644
+81 −0

File added.

Preview size limit exceeded, changes collapsed.

media/libeffects/lvm/tests/EffectTestHelper.h

0 → 100644
+123 −0

File added.

Preview size limit exceeded, changes collapsed.