Merge "[AU] Update volume setting and Audio Device API 3.0" into lmp-sprout-dev (79e687ed) · Commits · e / os / android_frameworks_av

services/audiopolicy/AudioPolicyManager.cpp

+11 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@

		// A device mask for all audio input devices that are considered "virtual" when evaluating
		// active inputs in getActiveInput()
		#define APM_AUDIO_IN_DEVICE_VIRTUAL_ALL AUDIO_DEVICE_IN_REMOTE_SUBMIX
		#define APM_AUDIO_IN_DEVICE_VIRTUAL_ALL (AUDIO_DEVICE_IN_REMOTE_SUBMIX\|AUDIO_DEVICE_IN_FM_TUNER)
		// A device mask for all audio output devices that are considered "remote" when evaluating
		// active output devices in isStreamActiveRemotely()
		#define APM_AUDIO_OUT_DEVICE_REMOTE_ALL AUDIO_DEVICE_OUT_REMOTE_SUBMIX
		@@ -707,7 +707,7 @@ void AudioPolicyManager::setForceUse(audio_policy_force_use_t usage,
		config != AUDIO_POLICY_FORCE_WIRED_ACCESSORY &&
		config != AUDIO_POLICY_FORCE_ANALOG_DOCK &&
		config != AUDIO_POLICY_FORCE_DIGITAL_DOCK && config != AUDIO_POLICY_FORCE_NONE &&
		config != AUDIO_POLICY_FORCE_NO_BT_A2DP) {
		config != AUDIO_POLICY_FORCE_NO_BT_A2DP && config != AUDIO_POLICY_FORCE_SPEAKER ) {
		ALOGW("setForceUse() invalid config %d for FOR_MEDIA", config);
		return;
		}
		@@ -4158,6 +4158,10 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate
		device2 = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER;
		}
		}
		if ((device2 == AUDIO_DEVICE_NONE) &&
		(mForceUse[AUDIO_POLICY_FORCE_FOR_MEDIA] == AUDIO_POLICY_FORCE_SPEAKER)) {
		device2 = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_SPEAKER;
		}
		if (device2 == AUDIO_DEVICE_NONE) {
		device2 = availableOutputDeviceTypes & AUDIO_DEVICE_OUT_WIRED_HEADPHONE;
		}
		@@ -4667,6 +4671,11 @@ audio_devices_t AudioPolicyManager::getDeviceForInputSource(audio_source_t input
		device = AUDIO_DEVICE_IN_REMOTE_SUBMIX;
		}
		break;
		case AUDIO_SOURCE_FM_TUNER:
		if (availableDeviceTypes & AUDIO_DEVICE_IN_FM_TUNER) {
		device = AUDIO_DEVICE_IN_FM_TUNER;
		}
		break;
		default:
		ALOGW("getDeviceForInputSource() invalid input source %d", inputSource);
		break;

services/audiopolicy/AudioPolicyManager.h

+5 −4

Original line number	Diff line number	Diff line
		@@ -600,8 +600,10 @@ protected:
		audio_io_handle_t output, audio_devices_t device);

		// check that volume change is permitted, compute and send new volume to audio hardware
		status_t checkAndSetVolume(audio_stream_type_t stream, int index, audio_io_handle_t output,
		audio_devices_t device, int delayMs = 0, bool force = false);
		virtual status_t checkAndSetVolume(audio_stream_type_t stream, int index,
		audio_io_handle_t output,
		audio_devices_t device,
		int delayMs = 0, bool force = false);

		// apply all stream volumes to the specified output and device
		void applyStreamVolumes(audio_io_handle_t output, audio_devices_t device, int delayMs = 0, bool force = false);
		@@ -820,10 +822,9 @@ protected:
		uint32_t mTestChannels;
		uint32_t mTestLatencyMs;
		#endif //AUDIO_POLICY_TEST

		private:
		static float volIndexToAmpl(audio_devices_t device, const StreamDescriptor& streamDesc,
		int indexInUi);
		private:
		// updates device caching and output for streams that can influence the
		// routing of notifications
		void handleNotificationRoutingForStream(audio_stream_type_t stream);