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

Commit 0d4dada1 authored Nov 05, 2024 by Treehugger Robot Committed by Automerger Merge Worker Nov 05, 2024

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

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

Change-Id: Ieacdddb4497752ae756723d65a688595ac22b0f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 29c7b861 c5d9dca9

audio/aidl/vts/EffectHelper.h

+1 −0

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

	static constexpr float kMaxAudioSampleValue = 1;		static constexpr float kMaxAudioSampleValue = 1;
			static constexpr int kSamplingFrequency = 44100;

	class EffectHelper {		class EffectHelper {
	public:		public:

audio/aidl/vts/VtsHalBassBoostTargetTest.cpp

+0 −1

Original line number	Original line	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 kDurationMilliSec = 720;
	static constexpr int kInputSize = kSamplingFrequency * kDurationMilliSec / 1000;		static constexpr int kInputSize = kSamplingFrequency * kDurationMilliSec / 1000;
	long mInputFrameCount, mOutputFrameCount;		long mInputFrameCount, mOutputFrameCount;

audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp

+0 −2

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

	void generateSineWaveInput(std::vector<float>& input) {		void generateSineWaveInput(std::vector<float>& input) {
	int frequency = 1000;		int frequency = 1000;
	size_t kSamplingFrequency = 44100;
	for (size_t i = 0; i < input.size(); i++) {		for (size_t i = 0; i < input.size(); i++) {
	input[i] = sin(2 * M_PI * frequency * i / kSamplingFrequency);		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 kDurationMilliSec = 500;
	static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;		static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;

audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp

+0 −1

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

	static constexpr int kSamplingFrequency = 44100;
	static constexpr int kDurationMilliSec = 500;		static constexpr int kDurationMilliSec = 500;
	static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;		static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;
	int mStereoChannelCount =		int mStereoChannelCount =

audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp

+0 −1

Original line number	Original line	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 kDefaultChannelLayout = AudioChannelLayout::LAYOUT_STEREO;
	static constexpr int kDurationMilliSec = 720;		static constexpr int kDurationMilliSec = 720;
	static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;		static constexpr int kBufferSize = kSamplingFrequency * kDurationMilliSec / 1000;