Merge "AudioSystem JNI: Add support for spatializer APIs" into sc-v2-dev am: 8c500d5882 (af8b4f4d) · Commits · e / os / android_frameworks_base

Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -342,6 +342,8 @@ java_defaults {
	"modules-utils-preconditions",		"modules-utils-preconditions",
	"modules-utils-os",		"modules-utils-os",
	"framework-permission-aidl-java",		"framework-permission-aidl-java",
			"spatializer-aidl-java",
			"audiopolicy-types-aidl-java",
	],		],
	}		}

core/jni/Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -243,6 +243,8 @@ cc_library_shared {
	shared_libs: [		shared_libs: [
	"audioclient-types-aidl-cpp",		"audioclient-types-aidl-cpp",
	"audioflinger-aidl-cpp",		"audioflinger-aidl-cpp",
			"audiopolicy-types-aidl-cpp",
			"spatializer-aidl-cpp",
	"av-types-aidl-cpp",		"av-types-aidl-cpp",
	"android.hardware.camera.device@3.2",		"android.hardware.camera.device@3.2",
	"libandroidicu",		"libandroidicu",

core/jni/android_media_AudioDeviceAttributes.cpp

+25 −2

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,11 @@ using namespace android;

	static jclass gAudioDeviceAttributesClass;		static jclass gAudioDeviceAttributesClass;
	static jmethodID gAudioDeviceAttributesCstor;		static jmethodID gAudioDeviceAttributesCstor;
			static struct {
			jfieldID mAddress;
			jfieldID mNativeType;
			// other fields unused by JNI
			} gAudioDeviceAttributesFields;

	namespace android {		namespace android {

	@@ -33,12 +38,25 @@ jint createAudioDeviceAttributesFromNative(JNIEnv env, jobject jAudioDeviceAtt
	jint jNativeType = (jint)devTypeAddr->mType;		jint jNativeType = (jint)devTypeAddr->mType;
	ScopedLocalRef<jstring> jAddress(env, env->NewStringUTF(devTypeAddr->getAddress()));		ScopedLocalRef<jstring> jAddress(env, env->NewStringUTF(devTypeAddr->getAddress()));

	*jAudioDeviceAttributes = env->NewObject(gAudioDeviceAttributesClass, gAudioDeviceAttributesCstor,		*jAudioDeviceAttributes =
			env->NewObject(gAudioDeviceAttributesClass, gAudioDeviceAttributesCstor,
	jNativeType, jAddress.get());		jNativeType, jAddress.get());

	return jStatus;		return jStatus;
	}		}

			jint createAudioDeviceTypeAddrFromJava(JNIEnv env, AudioDeviceTypeAddr devTypeAddr,
			const jobject jAudioDeviceAttributes) {
			devTypeAddr->mType = (audio_devices_t)env->GetIntField(jAudioDeviceAttributes,
			gAudioDeviceAttributesFields.mNativeType);

			jstring jAddress = (jstring)env->GetObjectField(jAudioDeviceAttributes,
			gAudioDeviceAttributesFields.mAddress);
			devTypeAddr->setAddress(ScopedUtfChars(env, jAddress).c_str());

			return AUDIO_JAVA_SUCCESS;
			}

	} // namespace android		} // namespace android

	int register_android_media_AudioDeviceAttributes(JNIEnv *env) {		int register_android_media_AudioDeviceAttributes(JNIEnv *env) {
	@@ -48,5 +66,10 @@ int register_android_media_AudioDeviceAttributes(JNIEnv *env) {
	gAudioDeviceAttributesCstor =		gAudioDeviceAttributesCstor =
	GetMethodIDOrDie(env, audioDeviceTypeAddressClass, "<init>", "(ILjava/lang/String;)V");		GetMethodIDOrDie(env, audioDeviceTypeAddressClass, "<init>", "(ILjava/lang/String;)V");

			gAudioDeviceAttributesFields.mNativeType =
			GetFieldIDOrDie(env, gAudioDeviceAttributesClass, "mNativeType", "I");
			gAudioDeviceAttributesFields.mAddress =
			GetFieldIDOrDie(env, gAudioDeviceAttributesClass, "mAddress", "Ljava/lang/String;");

	return 0;		return 0;
	}		}

core/jni/android_media_AudioDeviceAttributes.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,9 @@ namespace android {

	extern jint createAudioDeviceAttributesFromNative(JNIEnv env, jobject jAudioDeviceAttributes,		extern jint createAudioDeviceAttributesFromNative(JNIEnv env, jobject jAudioDeviceAttributes,
	const AudioDeviceTypeAddr *devTypeAddr);		const AudioDeviceTypeAddr *devTypeAddr);

			extern jint createAudioDeviceTypeAddrFromJava(JNIEnv env, AudioDeviceTypeAddr devTypeAddr,
			const jobject jAudioDeviceAttributes);
	} // namespace android		} // namespace android

	#endif		#endif
			No newline at end of file

core/jni/android_media_AudioSystem.cpp

+76 −8

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,8 @@
	#include "core_jni_helpers.h"		#include "core_jni_helpers.h"

	#include <android/media/AudioVibratorInfo.h>		#include <android/media/AudioVibratorInfo.h>
			#include <android/media/INativeSpatializerCallback.h>
			#include <android/media/ISpatializer.h>
	#include <audiomanager/AudioManager.h>		#include <audiomanager/AudioManager.h>
	#include <media/AudioPolicy.h>		#include <media/AudioPolicy.h>
	#include <media/AudioSystem.h>		#include <media/AudioSystem.h>
	@@ -2023,6 +2025,18 @@ android_media_AudioSystem_registerRoutingCallback(JNIEnv *env, jobject thiz)
	AudioSystem::setRoutingCallback(android_media_AudioSystem_routing_callback);		AudioSystem::setRoutingCallback(android_media_AudioSystem_routing_callback);
	}		}

			void javaAudioFormatToNativeAudioConfig(JNIEnv env, audio_config_t nConfig,
			const jobject jFormat, bool isInput) {
			*nConfig = AUDIO_CONFIG_INITIALIZER;
			nConfig->format = audioFormatToNative(env->GetIntField(jFormat, gAudioFormatFields.mEncoding));
			nConfig->sample_rate = env->GetIntField(jFormat, gAudioFormatFields.mSampleRate);
			jint jChannelMask = env->GetIntField(jFormat, gAudioFormatFields.mChannelMask);
			if (isInput) {
			nConfig->channel_mask = inChannelMaskToNative(jChannelMask);
			} else {
			nConfig->channel_mask = outChannelMaskToNative(jChannelMask);
			}
			}

	static jint convertAudioMixToNative(JNIEnv *env,		static jint convertAudioMixToNative(JNIEnv *env,
	AudioMix *nAudioMix,		AudioMix *nAudioMix,
	@@ -2043,13 +2057,7 @@ static jint convertAudioMixToNative(JNIEnv *env,
	nAudioMix->mCbFlags = env->GetIntField(jAudioMix, gAudioMixFields.mCallbackFlags);		nAudioMix->mCbFlags = env->GetIntField(jAudioMix, gAudioMixFields.mCallbackFlags);

	jobject jFormat = env->GetObjectField(jAudioMix, gAudioMixFields.mFormat);		jobject jFormat = env->GetObjectField(jAudioMix, gAudioMixFields.mFormat);
	nAudioMix->mFormat = AUDIO_CONFIG_INITIALIZER;		javaAudioFormatToNativeAudioConfig(env, &nAudioMix->mFormat, jFormat, false /isInput/);
	nAudioMix->mFormat.sample_rate = env->GetIntField(jFormat,
	gAudioFormatFields.mSampleRate);
	nAudioMix->mFormat.channel_mask = outChannelMaskToNative(env->GetIntField(jFormat,
	gAudioFormatFields.mChannelMask));
	nAudioMix->mFormat.format = audioFormatToNative(env->GetIntField(jFormat,
	gAudioFormatFields.mEncoding));
	env->DeleteLocalRef(jFormat);		env->DeleteLocalRef(jFormat);

	jobject jRule = env->GetObjectField(jAudioMix, gAudioMixFields.mRule);		jobject jRule = env->GetObjectField(jAudioMix, gAudioMixFields.mRule);
	@@ -2712,6 +2720,58 @@ static jint android_media_AudioSystem_setVibratorInfos(JNIEnv *env, jobject thiz
	return (jint)check_AudioSystem_Command(AudioSystem::setVibratorInfos(vibratorInfos));		return (jint)check_AudioSystem_Command(AudioSystem::setVibratorInfos(vibratorInfos));
	}		}

			static jobject android_media_AudioSystem_getSpatializer(JNIEnv *env, jobject thiz,
			jobject jISpatializerCallback) {
			sp<media::INativeSpatializerCallback> nISpatializerCallback
			= interface_cast<media::INativeSpatializerCallback>(
			ibinderForJavaObject(env, jISpatializerCallback));
			sp<media::ISpatializer> nSpatializer;
			status_t status = AudioSystem::getSpatializer(nISpatializerCallback,
			&nSpatializer);
			if (status != NO_ERROR) {
			return nullptr;
			}
			return javaObjectForIBinder(env, IInterface::asBinder(nSpatializer));
			}

			static jboolean android_media_AudioSystem_canBeSpatialized(JNIEnv *env, jobject thiz,
			jobject jaa, jobject jFormat,
			jobjectArray jDeviceArray) {
			JNIAudioAttributeHelper::UniqueAaPtr paa = JNIAudioAttributeHelper::makeUnique();
			jint jStatus = JNIAudioAttributeHelper::nativeFromJava(env, jaa, paa.get());
			if (jStatus != (jint)AUDIO_JAVA_SUCCESS) {
			return false;
			}

			AudioDeviceTypeAddrVector nDevices;

			const size_t numDevices = env->GetArrayLength(jDeviceArray);
			for (size_t i = 0; i < numDevices; ++i) {
			AudioDeviceTypeAddr device;
			jobject jDevice = env->GetObjectArrayElement(jDeviceArray, i);
			if (jDevice == nullptr) {
			return false;
			}
			jStatus = createAudioDeviceTypeAddrFromJava(env, &device, jDevice);
			if (jStatus != (jint)AUDIO_JAVA_SUCCESS) {
			return false;
			}
			nDevices.push_back(device);
			}

			audio_config_t nConfig;
			javaAudioFormatToNativeAudioConfig(env, &nConfig, jFormat, false /isInput/);

			bool canBeSpatialized;
			status_t status =
			AudioSystem::canBeSpatialized(paa.get(), &nConfig, nDevices, &canBeSpatialized);
			if (status != NO_ERROR) {
			ALOGW("%s native returned error %d", __func__, status);
			return false;
			}
			return canBeSpatialized;
			}

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

	static const JNINativeMethod gMethods[] =		static const JNINativeMethod gMethods[] =
	@@ -2848,7 +2908,15 @@ static const JNINativeMethod gMethods[] =
	(void *)android_media_AudioSystem_removeUserIdDeviceAffinities},		(void *)android_media_AudioSystem_removeUserIdDeviceAffinities},
	{"setCurrentImeUid", "(I)I", (void *)android_media_AudioSystem_setCurrentImeUid},		{"setCurrentImeUid", "(I)I", (void *)android_media_AudioSystem_setCurrentImeUid},
	{"setVibratorInfos", "(Ljava/util/List;)I",		{"setVibratorInfos", "(Ljava/util/List;)I",
	(void *)android_media_AudioSystem_setVibratorInfos}};		(void *)android_media_AudioSystem_setVibratorInfos},
			{"nativeGetSpatializer",
			"(Landroid/media/INativeSpatializerCallback;)Landroid/os/IBinder;",
			(void *)android_media_AudioSystem_getSpatializer},
			{"canBeSpatialized",
			"(Landroid/media/AudioAttributes;Landroid/media/AudioFormat;"
			"[Landroid/media/AudioDeviceAttributes;)Z",
			(void *)android_media_AudioSystem_canBeSpatialized}};


	static const JNINativeMethod gEventHandlerMethods[] = {		static const JNINativeMethod gEventHandlerMethods[] = {
	{"native_setup",		{"native_setup",