Merge "audioflinger: fix mmap stream volume" into oc-dev (6534425f) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2676,12 +2676,14 @@ AudioFlinger::MmapThread *AudioFlinger::checkMmapThread_l(audio_io_handle_t io)
	// checkPlaybackThread_l() must be called with AudioFlinger::mLock held		// checkPlaybackThread_l() must be called with AudioFlinger::mLock held
	AudioFlinger::VolumeInterface *AudioFlinger::getVolumeInterface_l(audio_io_handle_t output) const		AudioFlinger::VolumeInterface *AudioFlinger::getVolumeInterface_l(audio_io_handle_t output) const
	{		{
	VolumeInterface volumeInterface = (VolumeInterface )mPlaybackThreads.valueFor(output).get();		VolumeInterface *volumeInterface = mPlaybackThreads.valueFor(output).get();
	if (volumeInterface == nullptr) {		if (volumeInterface == nullptr) {
	MmapThread *mmapThread = mMmapThreads.valueFor(output).get();		MmapThread *mmapThread = mMmapThreads.valueFor(output).get();
	if (mmapThread != nullptr) {		if (mmapThread != nullptr) {
	if (mmapThread->isOutput()) {		if (mmapThread->isOutput()) {
	volumeInterface = (VolumeInterface *)mmapThread;		MmapPlaybackThread *mmapPlaybackThread =
			static_cast<MmapPlaybackThread *>(mmapThread);
			volumeInterface = mmapPlaybackThread;
	}		}
	}		}
	}		}
	@@ -2692,11 +2694,13 @@ Vector <AudioFlinger::VolumeInterface *> AudioFlinger::getAllVolumeInterfaces_l(
	{		{
	Vector <VolumeInterface *> volumeInterfaces;		Vector <VolumeInterface *> volumeInterfaces;
	for (size_t i = 0; i < mPlaybackThreads.size(); i++) {		for (size_t i = 0; i < mPlaybackThreads.size(); i++) {
	volumeInterfaces.add((VolumeInterface *)mPlaybackThreads.valueAt(i).get());		volumeInterfaces.add(mPlaybackThreads.valueAt(i).get());
	}		}
	for (size_t i = 0; i < mMmapThreads.size(); i++) {		for (size_t i = 0; i < mMmapThreads.size(); i++) {
	if (mMmapThreads.valueAt(i)->isOutput()) {		if (mMmapThreads.valueAt(i)->isOutput()) {
	volumeInterfaces.add((VolumeInterface *)mMmapThreads.valueAt(i).get());		MmapPlaybackThread *mmapPlaybackThread =
			static_cast<MmapPlaybackThread *>(mMmapThreads.valueAt(i).get());
			volumeInterfaces.add(mmapPlaybackThread);
	}		}
	}		}
	return volumeInterfaces;		return volumeInterfaces;