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

Commit 819b2253 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "VtsHalTargetTest: Define kSamplingFrequency in EffectHelper.h" into... 

Merge "VtsHalTargetTest: Define kSamplingFrequency in EffectHelper.h" into main am: c5d9dca9 am: 0d4dada1

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



Change-Id: Ie52254748e7f2d0b0c9dd60e4cd629fc260aaf3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 755753f5 0d4dada1

audio/aidl/vts/EffectHelper.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ static inline std::string getPrefix(Descriptor& descriptor) { 
}



static constexpr float kMaxAudioSampleValue = 1;

static constexpr int kSamplingFrequency = 44100;



class EffectHelper {

  public:

audio/aidl/vts/VtsHalBassBoostTargetTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ class BassBoostEffectHelper : public EffectHelper { 
        }

    }



    static constexpr int kSamplingFrequency = 44100;

    static constexpr int kDurationMilliSec = 720;

    static constexpr int kInputSize = kSamplingFrequency * kDurationMilliSec / 1000;

    long mInputFrameCount, mOutputFrameCount;

audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp

+0 −2
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ class EnvironmentalReverbHelper : public EffectHelper { 


    void generateSineWaveInput(std::vector<float>& input) {

        int frequency = 1000;

        size_t kSamplingFrequency = 44100;

        for (size_t i = 0; i < input.size(); i++) {

            input[i] = sin(2 * M_PI * frequency * i / kSamplingFrequency);

        }
@@ -286,7 +285,6 @@ class EnvironmentalReverbHelper : public EffectHelper { 
        }

    }



    static constexpr int kSamplingFrequency = 44100;

    static constexpr int kDurationMilliSec = 500;

    static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;

audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ class PresetReverbHelper : public EffectHelper { 
                                           << "\ngetParam:" << getParam.toString();

    }



    static constexpr int kSamplingFrequency = 44100;

    static constexpr int kDurationMilliSec = 500;

    static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;

    int mStereoChannelCount =

audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ class VirtualizerHelper : public EffectHelper { 
        }

    }



    static constexpr int kSamplingFrequency = 44100;

    static constexpr int kDefaultChannelLayout = AudioChannelLayout::LAYOUT_STEREO;

    static constexpr int kDurationMilliSec = 720;

    static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;