Merge "audio policy: add method to query dB attenuation for a certain volume... (1165cb67) · Commits · e / os / android_frameworks_av

media/libaudioclient/AudioSystem.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -1225,6 +1225,13 @@ status_t AudioSystem::getMasterMono(bool *mono)
		return aps->getMasterMono(mono);
		}

		float AudioSystem::getStreamVolumeDB(audio_stream_type_t stream, int index, audio_devices_t device)
		{
		const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
		if (aps == 0) return NAN;
		return aps->getStreamVolumeDB(stream, index, device);
		}

		// ---------------------------------------------------------------------------

		int AudioSystem::AudioPolicyServiceClient::addAudioPortCallback(

+27 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include <utils/Log.h>

		#include <stdint.h>
		#include <math.h>
		#include <sys/types.h>

		#include <binder/Parcel.h>
		@@ -77,6 +78,7 @@ enum {
		SET_AUDIO_PORT_CALLBACK_ENABLED,
		SET_MASTER_MONO,
		GET_MASTER_MONO,
		GET_STREAM_VOLUME_DB
		};

		#define MAX_ITEMS_PER_LIST 1024
		@@ -815,6 +817,20 @@ public:
		}
		return status;
		}

		virtual float getStreamVolumeDB(audio_stream_type_t stream, int index, audio_devices_t device)
		{
		Parcel data, reply;
		data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
		data.writeInt32(static_cast <int32_t>(stream));
		data.writeInt32(static_cast <int32_t>(index));
		data.writeUint32(static_cast <uint32_t>(device));
		status_t status = remote()->transact(GET_STREAM_VOLUME_DB, data, &reply);
		if (status != NO_ERROR) {
		return NAN;
		}
		return reply.readFloat();
		}
		};

		IMPLEMENT_META_INTERFACE(AudioPolicyService, "android.media.IAudioPolicyService");
		@@ -1405,6 +1421,17 @@ status_t BnAudioPolicyService::onTransact(
		return NO_ERROR;
		} break;

		case GET_STREAM_VOLUME_DB: {
		CHECK_INTERFACE(IAudioPolicyService, data, reply);
		audio_stream_type_t stream =
		static_cast <audio_stream_type_t>(data.readInt32());
		int index = static_cast <int>(data.readInt32());
		audio_devices_t device =
		static_cast <audio_devices_t>(data.readUint32());
		reply->writeFloat(getStreamVolumeDB(stream, index, device));
		return NO_ERROR;
		}

		default:
		return BBinder::onTransact(code, data, reply, flags);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -338,6 +338,9 @@ public:
		static status_t setMasterMono(bool mono);
		static status_t getMasterMono(bool *mono);

		static float getStreamVolumeDB(
		audio_stream_type_t stream, int index, audio_devices_t device);

		// ----------------------------------------------------------------------------

		class AudioPortCallback : public RefBase

+2 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,8 @@ public:

		virtual status_t setMasterMono(bool mono) = 0;
		virtual status_t getMasterMono(bool *mono) = 0;
		virtual float getStreamVolumeDB(
		audio_stream_type_t stream, int index, audio_devices_t device) = 0;
		};

+3 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,9 @@ public:

		virtual status_t setMasterMono(bool mono) = 0;
		virtual status_t getMasterMono(bool *mono) = 0;

		virtual float getStreamVolumeDB(
		audio_stream_type_t stream, int index, audio_devices_t device) = 0;
		};