Apply intensity control for haptic data. (77270b88) · Commits · e / os / android_frameworks_av

media/libaudioclient/include/media/AudioMixer.h

+61 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ public:
		MIXER_CHANNEL_MASK = 0x4006, // Channel mask for mixer output
		// for haptic
		HAPTIC_ENABLED = 0x4007, // Set haptic data from this track should be played or not.
		HAPTIC_INTENSITY = 0x4008, // Set the intensity to play haptic data.
		// for target RESAMPLE
		SAMPLE_RATE = 0x4100, // Configure sample rate conversion on this track name;
		// parameter 'value' is the new sample rate in Hz.
		@@ -102,6 +103,31 @@ public:
		// parameter 'value' is a pointer to the new playback rate.
		};

		enum { // Haptic intensity, should keep consistent with VibratorService
		HAPTIC_SCALE_VERY_LOW = -2,
		HAPTIC_SCALE_LOW = -1,
		HAPTIC_SCALE_NONE = 0,
		HAPTIC_SCALE_HIGH = 1,
		HAPTIC_SCALE_VERY_HIGH = 2,
		};
		typedef int32_t haptic_intensity_t;
		static constexpr float HAPTIC_SCALE_VERY_LOW_RATIO = 2 / 3;
		static constexpr float HAPTIC_SCALE_LOW_RATIO = 3 / 4;
		static const CONSTEXPR float HAPTIC_MAX_AMPLITUDE_FLOAT = 1.0f;

		static inline bool isValidHapticIntensity(haptic_intensity_t hapticIntensity) {
		switch (hapticIntensity) {
		case HAPTIC_SCALE_VERY_LOW:
		case HAPTIC_SCALE_LOW:
		case HAPTIC_SCALE_NONE:
		case HAPTIC_SCALE_HIGH:
		case HAPTIC_SCALE_VERY_HIGH:
		return true;
		default:
		return false;
		}
		}

		AudioMixer(size_t frameCount, uint32_t sampleRate)
		: mSampleRate(sampleRate)
		, mFrameCount(frameCount) {
		@@ -147,6 +173,7 @@ public:
		}
		}
		(this->*mHook)();
		processHapticData();
		}

		size_t getUnreleasedFrames(int name) const;
		@@ -364,6 +391,7 @@ private:

		// Haptic
		bool mHapticPlaybackEnabled;
		haptic_intensity_t mHapticIntensity;
		audio_channel_mask_t mHapticChannelMask;
		uint32_t mHapticChannelCount;
		audio_channel_mask_t mMixerHapticChannelMask;
		@@ -374,6 +402,37 @@ private:
		uint32_t mAdjustNonDestructiveOutChannelCount;
		bool mKeepContractedChannels;

		float getHapticScaleGamma() const {
		// Need to keep consistent with the value in VibratorService.
		switch (mHapticIntensity) {
		case HAPTIC_SCALE_VERY_LOW:
		return 2.0f;
		case HAPTIC_SCALE_LOW:
		return 1.5f;
		case HAPTIC_SCALE_HIGH:
		return 0.5f;
		case HAPTIC_SCALE_VERY_HIGH:
		return 0.25f;
		default:
		return 1.0f;
		}
		}

		float getHapticMaxAmplitudeRatio() const {
		// Need to keep consistent with the value in VibratorService.
		switch (mHapticIntensity) {
		case HAPTIC_SCALE_VERY_LOW:
		return HAPTIC_SCALE_VERY_LOW_RATIO;
		case HAPTIC_SCALE_LOW:
		return HAPTIC_SCALE_LOW_RATIO;
		case HAPTIC_SCALE_NONE:
		case HAPTIC_SCALE_HIGH:
		case HAPTIC_SCALE_VERY_HIGH:
		default:
		return 1.0f;
		}
		}

		private:
		// hooks
		void track__genericResample(int32_t* out, size_t numFrames, int32_t* temp, int32_t* aux);
		@@ -410,6 +469,8 @@ private:
		template <int MIXTYPE, typename TO, typename TI, typename TA>
		void process__noResampleOneTrack();

		void processHapticData();

		static process_hook_t getProcessHook(int processType, uint32_t channelCount,
		audio_format_t mixerInFormat, audio_format_t mixerOutFormat);

media/libaudioprocessing/AudioMixer.cpp

+41 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ status_t AudioMixer::create(
		t->mPlaybackRate = AUDIO_PLAYBACK_RATE_DEFAULT;
		// haptic
		t->mHapticPlaybackEnabled = false;
		t->mHapticIntensity = HAPTIC_SCALE_NONE;
		t->mMixerHapticChannelMask = AUDIO_CHANNEL_NONE;
		t->mMixerHapticChannelCount = 0;
		t->mAdjustInChannelCount = t->channelCount + t->mHapticChannelCount;
		@@ -717,6 +718,12 @@ void AudioMixer::setParameter(int name, int target, int param, void *value)
		track->prepareForAdjustChannels();
		}
		} break;
		case HAPTIC_INTENSITY: {
		const haptic_intensity_t hapticIntensity = static_cast<haptic_intensity_t>(valueInt);
		if (track->mHapticIntensity != hapticIntensity) {
		track->mHapticIntensity = hapticIntensity;
		}
		} break;
		default:
		LOG_ALWAYS_FATAL("setParameter track: bad param %d", param);
		}
		@@ -1846,6 +1853,40 @@ void AudioMixer::process__noResampleOneTrack()
		}
		}

		void AudioMixer::processHapticData()
		{
		// Need to keep consistent with VibrationEffect.scale(int, float, int)
		for (const auto &pair : mGroups) {
		// process by group of tracks with same output main buffer.
		const auto &group = pair.second;
		for (const int name : group) {
		const std::shared_ptr<Track> &t = mTracks[name];
		if (t->mHapticPlaybackEnabled) {
		size_t sampleCount = mFrameCount * t->mMixerHapticChannelCount;
		float gamma = t->getHapticScaleGamma();
		float maxAmplitudeRatio = t->getHapticMaxAmplitudeRatio();
		uint8_t* buffer = (uint8_t)pair.first + mFrameCount audio_bytes_per_frame(
		t->mMixerChannelCount, t->mMixerFormat);
		switch (t->mMixerFormat) {
		// Mixer format should be AUDIO_FORMAT_PCM_FLOAT.
		case AUDIO_FORMAT_PCM_FLOAT: {
		float* fout = (float*) buffer;
		for (size_t i = 0; i < sampleCount; i++) {
		float mul = fout[i] >= 0 ? 1.0 : -1.0;
		fout[i] = powf(fabsf(fout[i] / HAPTIC_MAX_AMPLITUDE_FLOAT), gamma)
		* maxAmplitudeRatio * HAPTIC_MAX_AMPLITUDE_FLOAT * mul;
		}
		} break;
		default:
		LOG_ALWAYS_FATAL("bad mMixerFormat: %#x", t->mMixerFormat);
		break;
		}
		break;
		}
		}
		}
		}

		/* This track hook is called to do resampling then mixing,
		* pulling from the track's upstream AudioBufferProvider.
		*

services/audioflinger/FastMixer.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -295,6 +295,8 @@ void FastMixer::onStateChange()
		(void *)(uintptr_t)mSinkChannelMask);
		mMixer->setParameter(name, AudioMixer::TRACK, AudioMixer::HAPTIC_ENABLED,
		(void *)(uintptr_t)fastTrack->mHapticPlaybackEnabled);
		mMixer->setParameter(name, AudioMixer::TRACK, AudioMixer::HAPTIC_INTENSITY,
		(void *)(uintptr_t)fastTrack->mHapticIntensity);
		mMixer->enable(name);
		}
		mGenerations[i] = fastTrack->mGeneration;
		@@ -333,6 +335,8 @@ void FastMixer::onStateChange()
		(void *)(uintptr_t)mSinkChannelMask);
		mMixer->setParameter(name, AudioMixer::TRACK, AudioMixer::HAPTIC_ENABLED,
		(void *)(uintptr_t)fastTrack->mHapticPlaybackEnabled);
		mMixer->setParameter(name, AudioMixer::TRACK, AudioMixer::HAPTIC_INTENSITY,
		(void *)(uintptr_t)fastTrack->mHapticIntensity);
		// already enabled
		}
		mGenerations[i] = fastTrack->mGeneration;

services/audioflinger/FastMixerState.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@

		#include <audio_utils/minifloat.h>
		#include <system/audio.h>
		#include <media/AudioMixer.h>
		#include <media/ExtendedAudioBufferProvider.h>
		#include <media/nbaio/NBAIO.h>
		#include <media/nblog/NBLog.h>
		@@ -48,6 +49,8 @@ struct FastTrack {
		audio_format_t mFormat; // track format
		int mGeneration; // increment when any field is assigned
		bool mHapticPlaybackEnabled = false; // haptic playback is enabled or not
		AudioMixer::haptic_intensity_t mHapticIntensity = AudioMixer::HAPTIC_SCALE_NONE; // intensity of
		// haptic data
		};

		// Represents a single state of the fast mixer

services/audioflinger/PlaybackTracks.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,14 @@ public:
		void setHapticPlaybackEnabled(bool hapticPlaybackEnabled) {
		mHapticPlaybackEnabled = hapticPlaybackEnabled;
		}
		/** Return at what intensity to play haptics, used in mixer. */
		AudioMixer::haptic_intensity_t getHapticIntensity() const { return mHapticIntensity; }
		/** Set intensity of haptic playback, should be set after querying vibrator service. */
		void setHapticIntensity(AudioMixer::haptic_intensity_t hapticIntensity) {
		if (AudioMixer::isValidHapticIntensity(hapticIntensity)) {
		mHapticIntensity = hapticIntensity;
		}
		}

		protected:
		// for numerous
		@@ -197,6 +205,8 @@ protected:
		sp<media::VolumeHandler> mVolumeHandler; // handles multiple VolumeShaper configs and operations

		bool mHapticPlaybackEnabled = false; // indicates haptic playback enabled or not
		// intensity to play haptic data
		AudioMixer::haptic_intensity_t mHapticIntensity = AudioMixer::HAPTIC_SCALE_NONE;

		private:
		// The following fields are only for fast tracks, and should be in a subclass