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

Commit 7bcd9c7b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update the input duration to reduce the number of samples to process"... 

Merge "Update the input duration to reduce the number of samples to process" into main am: 12086575

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3125534



Change-Id: I1614dd6323da566f354596476234ce789eb42898
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e10251c 12086575

audio/aidl/vts/VtsHalBassBoostTargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ class BassBoostEffectHelper : public EffectHelper { 
    }



    static constexpr int kSamplingFrequency = 44100;

    static constexpr int kDurationMilliSec = 2000;

    static constexpr int kDurationMilliSec = 720;

    static constexpr int kInputSize = kSamplingFrequency * kDurationMilliSec / 1000;

    long mInputFrameCount, mOutputFrameCount;

    std::shared_ptr<IFactory> mFactory;
@@ -231,7 +231,7 @@ class BassBoostDataTest : public ::testing::TestWithParam<BassBoostDataTestParam 
        return gains[0] - gains[1];

    }



    static constexpr int kNPointFFT = 32768;

    static constexpr int kNPointFFT = 16384;

    static constexpr float kBinWidth = (float)kSamplingFrequency / kNPointFFT;

    std::set<int> mStrengthValues;

    int32_t mChannelLayout;

audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ class PresetReverbHelper : public EffectHelper { 
    }



    static constexpr int kSamplingFrequency = 44100;

    static constexpr int kDurationMilliSec = 2000;

    static constexpr int kDurationMilliSec = 500;

    static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;

    int mStereoChannelCount =

            getChannelCount(AudioChannelLayout::make<AudioChannelLayout::layoutMask>(

audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ class VirtualizerHelper : public EffectHelper { 


    static constexpr int kSamplingFrequency = 44100;

    static constexpr int kDefaultChannelLayout = AudioChannelLayout::LAYOUT_STEREO;

    static constexpr int kDurationMilliSec = 2000;

    static constexpr int kDurationMilliSec = 720;

    static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;

    int kChannelCount = getChannelCount(

            AudioChannelLayout::make<AudioChannelLayout::layoutMask>(kDefaultChannelLayout));

audio/aidl/vts/VtsHalVolumeTargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class VolumeControlHelper : public EffectHelper { 
    }



    static constexpr int kSamplingFrequency = 44100;

    static constexpr int kDurationMilliSec = 2000;

    static constexpr int kDurationMilliSec = 720;

    static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;

    static constexpr int kMinLevel = -96;

    static constexpr int kDefaultChannelLayout = AudioChannelLayout::LAYOUT_STEREO;
@@ -174,7 +174,7 @@ class VolumeDataTest : public ::testing::TestWithParam<VolumeDataTestParam>, 


    static constexpr int kMaxAudioSample = 1;

    static constexpr int kTransitionDuration = 300;

    static constexpr int kNPointFFT = 32768;

    static constexpr int kNPointFFT = 16384;

    static constexpr float kBinWidth = (float)kSamplingFrequency / kNPointFFT;

    static constexpr size_t offset = kSamplingFrequency * kTransitionDuration / 1000;

    static constexpr float kBaseLevel = 0;