Merge "AudioFlinger: Remove conditional effect types" (9eb3b47e) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -596,8 +596,6 @@ private:
		};

		// --- PlaybackThread ---
		#define EFFECT_BUFFER_FORMAT AUDIO_FORMAT_PCM_FLOAT
		using effect_buffer_t = float;

		#include "Threads.h"

services/audioflinger/Effects.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -867,8 +867,8 @@ status_t AudioFlinger::EffectModule::configure()
		mOutChannelCountRequested =
		audio_channel_count_from_out_mask(mConfig.outputCfg.channels);

		mConfig.inputCfg.format = EFFECT_BUFFER_FORMAT;
		mConfig.outputCfg.format = EFFECT_BUFFER_FORMAT;
		mConfig.inputCfg.format = AUDIO_FORMAT_PCM_FLOAT;
		mConfig.outputCfg.format = AUDIO_FORMAT_PCM_FLOAT;

		// Don't use sample rate for thread if effect isn't offloadable.
		if (callback->isOffloadOrDirect() && !isOffloaded()) {
		@@ -2177,7 +2177,7 @@ void AudioFlinger::EffectChain::clearInputBuffer_l()
		if (mInBuffer == NULL) {
		return;
		}
		const size_t frameSize = audio_bytes_per_sample(EFFECT_BUFFER_FORMAT)
		const size_t frameSize = audio_bytes_per_sample(AUDIO_FORMAT_PCM_FLOAT)
		* mEffectCallback->inChannelCount(mEffects[0]->id());

		memset(mInBuffer->audioBuffer()->raw, 0, mEffectCallback->frameCount() * frameSize);

services/audioflinger/Effects.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -491,14 +491,14 @@ public:
		void setInBuffer(const sp<EffectBufferHalInterface>& buffer) {
		mInBuffer = buffer;
		}
		effect_buffer_t *inBuffer() const {
		return mInBuffer != 0 ? reinterpret_cast<effect_buffer_t*>(mInBuffer->ptr()) : NULL;
		float *inBuffer() const {
		return mInBuffer != 0 ? reinterpret_cast<float*>(mInBuffer->ptr()) : NULL;
		}
		void setOutBuffer(const sp<EffectBufferHalInterface>& buffer) {
		mOutBuffer = buffer;
		}
		effect_buffer_t *outBuffer() const {
		return mOutBuffer != 0 ? reinterpret_cast<effect_buffer_t*>(mOutBuffer->ptr()) : NULL;
		float *outBuffer() const {
		return mOutBuffer != 0 ? reinterpret_cast<float*>(mOutBuffer->ptr()) : NULL;
		}

		void incTrackCnt() { android_atomic_inc(&mTrackCnt); }

services/audioflinger/PlaybackTracks.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -116,8 +116,8 @@ public:
		status_t attachAuxEffect(int EffectId);
		void setAuxBuffer(int EffectId, int32_t *buffer);
		int32_t *auxBuffer() const { return mAuxBuffer; }
		void setMainBuffer(effect_buffer_t *buffer) { mMainBuffer = buffer; }
		effect_buffer_t *mainBuffer() const { return mMainBuffer; }
		void setMainBuffer(float *buffer) { mMainBuffer = buffer; }
		float *mainBuffer() const { return mMainBuffer; }
		int auxEffectId() const { return mAuxEffectId; }
		virtual status_t getTimestamp(AudioTimestamp& timestamp);
		void signal();
		@@ -283,7 +283,7 @@ protected:

		bool mResetDone;
		const audio_stream_type_t mStreamType;
		effect_buffer_t *mMainBuffer;
		float *mMainBuffer;

		int32_t *mAuxBuffer;
		int mAuxEffectId;

services/audioflinger/Threads.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -3106,7 +3106,7 @@ void AudioFlinger::PlaybackThread::readOutputParameters_l()
		free(mEffectBuffer);
		mEffectBuffer = NULL;
		if (mEffectBufferEnabled) {
		mEffectBufferFormat = EFFECT_BUFFER_FORMAT;
		mEffectBufferFormat = AUDIO_FORMAT_PCM_FLOAT;
		mEffectBufferSize = mNormalFrameCount * mixerChannelCount
		* audio_bytes_per_sample(mEffectBufferFormat);
		(void)posix_memalign(&mEffectBuffer, 32, mEffectBufferSize);
		@@ -3500,7 +3500,7 @@ status_t AudioFlinger::PlaybackThread::addEffectChain_l(const sp<EffectChain>& c
		{
		audio_session_t session = chain->sessionId();
		sp<EffectBufferHalInterface> halInBuffer, halOutBuffer;
		effect_buffer_t *buffer = nullptr; // only used for non global sessions
		float *buffer = nullptr; // only used for non global sessions

		if (mType == SPATIALIZER) {
		if (!audio_is_global_session(session)) {
		@@ -3518,7 +3518,7 @@ status_t AudioFlinger::PlaybackThread::addEffectChain_l(const sp<EffectChain>& c
		size_t numSamples = mNormalFrameCount
		* (audio_channel_count_from_out_mask(channelMask) + mHapticChannelCount);
		status_t result = mAudioFlinger->mEffectsFactoryHal->allocateBuffer(
		numSamples * sizeof(effect_buffer_t),
		numSamples * sizeof(float),
		&halInBuffer);
		if (result != OK) return result;

		@@ -3557,7 +3557,7 @@ status_t AudioFlinger::PlaybackThread::addEffectChain_l(const sp<EffectChain>& c
		halOutBuffer = halInBuffer;
		ALOGV("addEffectChain_l() %p on thread %p for session %d", chain.get(), this, session);
		if (!audio_is_global_session(session)) {
		buffer = halInBuffer ? reinterpret_cast<effect_buffer_t*>(halInBuffer->externalData())
		buffer = halInBuffer ? reinterpret_cast<float*>(halInBuffer->externalData())
		: buffer;
		// Only one effect chain can be present in direct output thread and it uses
		// the sink buffer as input
		@@ -3566,7 +3566,7 @@ status_t AudioFlinger::PlaybackThread::addEffectChain_l(const sp<EffectChain>& c
		* (audio_channel_count_from_out_mask(mMixerChannelMask)
		+ mHapticChannelCount);
		const status_t allocateStatus = mAudioFlinger->mEffectsFactoryHal->allocateBuffer(
		numSamples * sizeof(effect_buffer_t),
		numSamples * sizeof(float),
		&halInBuffer);
		if (allocateStatus != OK) return allocateStatus;

		@@ -3654,7 +3654,7 @@ size_t AudioFlinger::PlaybackThread::removeEffectChain_l(const sp<EffectChain>&
		for (size_t j = 0; j < mTracks.size(); ++j) {
		sp<Track> track = mTracks[j];
		if (session == track->sessionId()) {
		track->setMainBuffer(reinterpret_cast<effect_buffer_t*>(mSinkBuffer));
		track->setMainBuffer(reinterpret_cast<float*>(mSinkBuffer));
		chain->decTrackCnt();
		}
		}
		@@ -4059,12 +4059,12 @@ NO_THREAD_SAFETY_ANALYSIS // manual locking of AudioFlinger

		const size_t audioBufferSize = mNormalFrameCount
		* audio_bytes_per_frame(hapticSessionChannelCount,
		EFFECT_BUFFER_FORMAT);
		AUDIO_FORMAT_PCM_FLOAT);
		memcpy_by_audio_format(
		(uint8_t*)effectChains[i]->outBuffer() + audioBufferSize,
		EFFECT_BUFFER_FORMAT,
		AUDIO_FORMAT_PCM_FLOAT,
		(const uint8_t*)effectChains[i]->inBuffer() + audioBufferSize,
		EFFECT_BUFFER_FORMAT, mNormalFrameCount * mHapticChannelCount);
		AUDIO_FORMAT_PCM_FLOAT, mNormalFrameCount * mHapticChannelCount);
		}
		}
		}
		@@ -5706,7 +5706,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac
		mAudioMixer->setParameter(
		trackId,
		AudioMixer::TRACK,
		AudioMixer::MIXER_FORMAT, (void *)EFFECT_BUFFER_FORMAT);
		AudioMixer::MIXER_FORMAT, (void *)AUDIO_FORMAT_PCM_FLOAT);
		mAudioMixer->setParameter(
		trackId,
		AudioMixer::TRACK,