Merge "Bug 3366885 Remove LVMX switch" (8adacd8e) · Commits · e / os / android_frameworks_base

services/audioflinger/Android.mk

+0 −8

Original line number	Diff line number	Diff line
		@@ -120,12 +120,4 @@ ifeq ($(TARGET_SIMULATOR),true)
		endif
		endif

		ifeq ($(BOARD_USE_LVMX),true)
		LOCAL_CFLAGS += -DLVMX
		LOCAL_C_INCLUDES += vendor/nxp
		LOCAL_STATIC_LIBRARIES += liblifevibes
		LOCAL_SHARED_LIBRARIES += liblvmxservice
		# LOCAL_SHARED_LIBRARIES += liblvmxipc
		endif

		include $(BUILD_SHARED_LIBRARY)

services/audioflinger/AudioFlinger.cpp

+0 −130

Original line number	Diff line number	Diff line
		@@ -47,10 +47,6 @@
		#include "A2dpAudioInterface.h"
		#endif

		#ifdef LVMX
		#include "lifevibes.h"
		#endif

		#include <media/EffectsFactoryApi.h>
		#include <media/EffectVisualizerApi.h>

		@@ -149,10 +145,6 @@ AudioFlinger::AudioFlinger()
		} else {
		LOGE("Couldn't even initialize the stubbed audio hardware!");
		}
		#ifdef LVMX
		LifeVibes::init();
		mLifeVibesClientPid = -1;
		#endif
		}

		AudioFlinger::~AudioFlinger()
		@@ -485,9 +477,6 @@ status_t AudioFlinger::setMode(int mode)
		mMode = mode;
		for (uint32_t i = 0; i < mPlaybackThreads.size(); i++)
		mPlaybackThreads.valueAt(i)->setMode(mode);
		#ifdef LVMX
		LifeVibes::setMode(mode);
		#endif
		}

		return ret;
		@@ -635,39 +624,11 @@ status_t AudioFlinger::setParameters(int ioHandle, const String8& keyValuePairs)
		return PERMISSION_DENIED;
		}

		#ifdef LVMX
		AudioParameter param = AudioParameter(keyValuePairs);
		LifeVibes::setParameters(ioHandle,keyValuePairs);
		String8 key = String8(AudioParameter::keyRouting);
		int device;
		if (NO_ERROR != param.getInt(key, device)) {
		device = -1;
		}

		key = String8(LifevibesTag);
		String8 value;
		int musicEnabled = -1;
		if (NO_ERROR == param.get(key, value)) {
		if (value == LifevibesEnable) {
		mLifeVibesClientPid = IPCThreadState::self()->getCallingPid();
		musicEnabled = 1;
		} else if (value == LifevibesDisable) {
		mLifeVibesClientPid = -1;
		musicEnabled = 0;
		}
		}
		#endif

		// ioHandle == 0 means the parameters are global to the audio hardware interface
		if (ioHandle == 0) {
		AutoMutex lock(mHardwareLock);
		mHardwareStatus = AUDIO_SET_PARAMETER;
		result = mAudioHardware->setParameters(keyValuePairs);
		#ifdef LVMX
		if (musicEnabled != -1) {
		LifeVibes::enableMusic((bool) musicEnabled);
		}
		#endif
		mHardwareStatus = AUDIO_HW_IDLE;
		return result;
		}
		@@ -684,11 +645,6 @@ status_t AudioFlinger::setParameters(int ioHandle, const String8& keyValuePairs)
		}
		if (thread != NULL) {
		result = thread->setParameters(keyValuePairs);
		#ifdef LVMX
		if ((NO_ERROR == result) && (device != -1)) {
		LifeVibes::setDevice(LifeVibes::threadIdToAudioOutputType(thread->id()), device);
		}
		#endif
		return result;
		}
		return BAD_VALUE;
		@@ -802,13 +758,6 @@ void AudioFlinger::removeNotificationClient(pid_t pid)
		if (index >= 0) {
		sp <NotificationClient> client = mNotificationClients.valueFor(pid);
		LOGV("removeNotificationClient() %p, pid %d", client.get(), pid);
		#ifdef LVMX
		if (pid == mLifeVibesClientPid) {
		LOGV("Disabling lifevibes");
		LifeVibes::enableMusic(false);
		mLifeVibesClientPid = -1;
		}
		#endif
		mNotificationClients.removeItem(pid);
		}
		}
		@@ -1214,24 +1163,12 @@ uint32_t AudioFlinger::PlaybackThread::latency() const

		status_t AudioFlinger::PlaybackThread::setMasterVolume(float value)
		{
		#ifdef LVMX
		int audioOutputType = LifeVibes::getMixerType(mId, mType);
		if (LifeVibes::audioOutputTypeIsLifeVibes(audioOutputType)) {
		LifeVibes::setMasterVolume(audioOutputType, value);
		}
		#endif
		mMasterVolume = value;
		return NO_ERROR;
		}

		status_t AudioFlinger::PlaybackThread::setMasterMute(bool muted)
		{
		#ifdef LVMX
		int audioOutputType = LifeVibes::getMixerType(mId, mType);
		if (LifeVibes::audioOutputTypeIsLifeVibes(audioOutputType)) {
		LifeVibes::setMasterMute(audioOutputType, muted);
		}
		#endif
		mMasterMute = muted;
		return NO_ERROR;
		}
		@@ -1248,24 +1185,12 @@ bool AudioFlinger::PlaybackThread::masterMute() const

		status_t AudioFlinger::PlaybackThread::setStreamVolume(int stream, float value)
		{
		#ifdef LVMX
		int audioOutputType = LifeVibes::getMixerType(mId, mType);
		if (LifeVibes::audioOutputTypeIsLifeVibes(audioOutputType)) {
		LifeVibes::setStreamVolume(audioOutputType, stream, value);
		}
		#endif
		mStreamTypes[stream].volume = value;
		return NO_ERROR;
		}

		status_t AudioFlinger::PlaybackThread::setStreamMute(int stream, bool muted)
		{
		#ifdef LVMX
		int audioOutputType = LifeVibes::getMixerType(mId, mType);
		if (LifeVibes::audioOutputTypeIsLifeVibes(audioOutputType)) {
		LifeVibes::setStreamMute(audioOutputType, stream, muted);
		}
		#endif
		mStreamTypes[stream].mute = muted;
		return NO_ERROR;
		}
		@@ -1593,12 +1518,6 @@ bool AudioFlinger::MixerThread::threadLoop()
		}
		// enable changes in effect chain
		unlockEffectChains(effectChains);
		#ifdef LVMX
		int audioOutputType = LifeVibes::getMixerType(mId, mType);
		if (LifeVibes::audioOutputTypeIsLifeVibes(audioOutputType)) {
		LifeVibes::process(audioOutputType, mMixBuffer, mixBufferSize);
		}
		#endif
		mLastWriteTime = systemTime();
		mInWrite = true;
		mBytesWritten += mixBufferSize;
		@@ -1661,24 +1580,6 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track
		if (masterMute) {
		masterVolume = 0;
		}
		#ifdef LVMX
		bool tracksConnectedChanged = false;
		bool stateChanged = false;

		int audioOutputType = LifeVibes::getMixerType(mId, mType);
		if (LifeVibes::audioOutputTypeIsLifeVibes(audioOutputType))
		{
		int activeTypes = 0;
		for (size_t i=0 ; i<count ; i++) {
		sp<Track> t = activeTracks[i].promote();
		if (t == 0) continue;
		Track* const track = t.get();
		int iTracktype=track->type();
		activeTypes \|= 1<<track->type();
		}
		LifeVibes::computeVolumes(audioOutputType, activeTypes, tracksConnectedChanged, stateChanged, masterVolume, masterMute);
		}
		#endif
		// Delegate master volume control to effect in output mix effect chain if needed
		sp<EffectChain> chain = getEffectChain_l(AudioSystem::SESSION_OUTPUT_MIX);
		if (chain != 0) {
		@@ -1746,17 +1647,6 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track

		// read original volumes with volume control
		float typeVolume = mStreamTypes[track->type()].volume;
		#ifdef LVMX
		bool streamMute=false;
		// read the volume from the LivesVibes audio engine.
		if (LifeVibes::audioOutputTypeIsLifeVibes(audioOutputType))
		{
		LifeVibes::getStreamVolumes(audioOutputType, track->type(), &typeVolume, &streamMute);
		if (streamMute) {
		typeVolume = 0;
		}
		}
		#endif
		float v = masterVolume * typeVolume;
		vl = (uint32_t)(v * cblk->volume[0]) << 12;
		vr = (uint32_t)(v * cblk->volume[1]) << 12;
		@@ -1789,14 +1679,6 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track
		if (va > MAX_GAIN_INT) va = MAX_GAIN_INT;
		aux = int16_t(va);

		#ifdef LVMX
		if ( tracksConnectedChanged \|\| stateChanged )
		{
		// only do the ramp when the volume is changed by the user / application
		param = AudioMixer::VOLUME;
		}
		#endif

		// XXX: these things DON'T need to be done each time
		mAudioMixer->setBufferProvider(track);
		mAudioMixer->enable(AudioMixer::MIXING);
		@@ -4292,18 +4174,6 @@ int AudioFlinger::openOutput(uint32_t *pDevices,
		} else {
		thread = new MixerThread(this, output, id, *pDevices);
		LOGV("openOutput() created mixer output: ID %d thread %p", id, thread);

		#ifdef LVMX
		unsigned bitsPerSample =
		(format == AudioSystem::PCM_16_BIT) ? 16 :
		((format == AudioSystem::PCM_8_BIT) ? 8 : 0);
		unsigned channelCount = (channels == AudioSystem::CHANNEL_OUT_STEREO) ? 2 : 1;
		int audioOutputType = LifeVibes::threadIdToAudioOutputType(thread->id());

		LifeVibes::init_aot(audioOutputType, samplingRate, bitsPerSample, channelCount);
		LifeVibes::setDevice(audioOutputType, *pDevices);
		#endif

		}
		mPlaybackThreads.add(id, thread);

services/audioflinger/AudioFlinger.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -1181,9 +1181,6 @@ private:

		DefaultKeyedVector< pid_t, sp<NotificationClient> > mNotificationClients;
		volatile int32_t mNextUniqueId;
		#ifdef LVMX
		int mLifeVibesClientPid;
		#endif
		uint32_t mMode;

		};