Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dynamic audio policies: device type and address" into nyc-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2016-03-16 21:31:08 +00:00
committed by Android (Google) Code Review
parent 71e806b2f4 4ad39885f2
commit 400349907e
3 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/jni/android_media_AudioSystem.cpp
View File

@@ -109,7 +109,8 @@ static struct {
jfieldID mRule;
jfieldID mFormat;
jfieldID mRouteFlags;
jfieldID mRegistrationId;
jfieldID mDeviceType;
jfieldID mDeviceAddress;
jfieldID mMixType;
jfieldID mCallbackFlags;
} gAudioMixFields;
@@ -1561,13 +1562,15 @@ static jint convertAudioMixToNative(JNIEnv *env,
{
nAudioMix->mMixType = env->GetIntField(jAudioMix, gAudioMixFields.mMixType);
nAudioMix->mRouteFlags = env->GetIntField(jAudioMix, gAudioMixFields.mRouteFlags);
nAudioMix->mDeviceType = (audio_devices_t)
env->GetIntField(jAudioMix, gAudioMixFields.mDeviceType);
jstring jRegistrationId = (jstring)env->GetObjectField(jAudioMix,
gAudioMixFields.mRegistrationId);
const char *nRegistrationId = env->GetStringUTFChars(jRegistrationId, NULL);
nAudioMix->mRegistrationId = String8(nRegistrationId);
env->ReleaseStringUTFChars(jRegistrationId, nRegistrationId);
env->DeleteLocalRef(jRegistrationId);
jstring jDeviceAddress = (jstring)env->GetObjectField(jAudioMix,
gAudioMixFields.mDeviceAddress);
const char *nDeviceAddress = env->GetStringUTFChars(jDeviceAddress, NULL);
nAudioMix->mDeviceAddress = String8(nDeviceAddress);
env->ReleaseStringUTFChars(jDeviceAddress, nDeviceAddress);
env->DeleteLocalRef(jDeviceAddress);
nAudioMix->mCbFlags = env->GetIntField(jAudioMix, gAudioMixFields.mCallbackFlags);
@@ -1857,7 +1860,8 @@ int register_android_media_AudioSystem(JNIEnv *env)
gAudioMixFields.mFormat = GetFieldIDOrDie(env, audioMixClass, "mFormat",
"Landroid/media/AudioFormat;");
gAudioMixFields.mRouteFlags = GetFieldIDOrDie(env, audioMixClass, "mRouteFlags", "I");
gAudioMixFields.mRegistrationId = GetFieldIDOrDie(env, audioMixClass, "mRegistrationId",
gAudioMixFields.mDeviceType = GetFieldIDOrDie(env, audioMixClass, "mDeviceSystemType", "I");
gAudioMixFields.mDeviceAddress = GetFieldIDOrDie(env, audioMixClass, "mDeviceAddress",
"Ljava/lang/String;");
gAudioMixFields.mMixType = GetFieldIDOrDie(env, audioMixClass, "mMixType", "I");
gAudioMixFields.mCallbackFlags = GetFieldIDOrDie(env, audioMixClass, "mCallbackFlags", "I");

42
media/java/android/media/audiopolicy/AudioMix.java
View File

@@ -36,30 +36,28 @@ public class AudioMix {
private AudioMixingRule mRule;
private AudioFormat mFormat;
private int mRouteFlags;
private String mRegistrationId;
private int mMixType = MIX_TYPE_INVALID;
// written by AudioPolicy
int mMixState = MIX_STATE_DISABLED;
int mCallbackFlags;
String mDeviceAddress;
// initialized in constructor, read by AudioPolicyConfig
final int mDeviceId;
final String mDeviceAddress;
final int mDeviceSystemType; // an AudioSystem.DEVICE_* value, not AudioDeviceInfo.TYPE_*
/**
* All parameters are guaranteed valid through the Builder.
*/
private AudioMix(AudioMixingRule rule, AudioFormat format, int routeFlags, int callbackFlags,
int deviceId, String deviceAddress) {
int deviceType, String deviceAddress) {
mRule = rule;
mFormat = format;
mRouteFlags = routeFlags;
mRegistrationId = null;
mMixType = rule.getTargetMixType();
mCallbackFlags = callbackFlags;
mDeviceId = deviceId;
mDeviceAddress = deviceAddress;
mDeviceSystemType = deviceType;
mDeviceAddress = (deviceAddress == null) ? new String("") : deviceAddress;
}
// CALLBACK_FLAG_* values: keep in sync with AudioMix::kCbFlag* values defined
@@ -155,12 +153,12 @@ public class AudioMix {
}
void setRegistration(String regId) {
mRegistrationId = regId;
mDeviceAddress = regId;
}
/** @hide */
public String getRegistration() {
return mRegistrationId;
return mDeviceAddress;
}
/** @hide */
@@ -185,7 +183,8 @@ public class AudioMix {
private AudioFormat mFormat = null;
private int mRouteFlags = 0;
private int mCallbackFlags = 0;
private int mDeviceId = -1;
// an AudioSystem.DEVICE_* value, not AudioDeviceInfo.TYPE_*
private int mDeviceSystemType = AudioSystem.DEVICE_NONE;
private String mDeviceAddress = null;
/**
@@ -243,12 +242,12 @@ public class AudioMix {
/**
* @hide
* Only used by AudioPolicyConfig, not a public API.
* @param deviceId
* @param deviceType an AudioSystem.DEVICE_* value, not AudioDeviceInfo.TYPE_*
* @param address
* @return the same Builder instance.
*/
Builder setDevice(int deviceId, String address) {
mDeviceId = deviceId;
Builder setDevice(int deviceType, String address) {
mDeviceSystemType = deviceType;
mDeviceAddress = address;
return this;
}
@@ -312,7 +311,7 @@ public class AudioMix {
if (!device.isSink()) {
throw new IllegalArgumentException("Unsupported device type on mix, not a sink");
}
mDeviceId = device.getId();
mDeviceSystemType = AudioDeviceInfo.convertDeviceTypeToInternalDevice(device.getType());
mDeviceAddress = device.getAddress();
return this;
}
@@ -344,7 +343,9 @@ public class AudioMix {
}
mFormat = new AudioFormat.Builder().setSampleRate(rate).build();
}
if (mDeviceId != -1) {
if ((mDeviceSystemType != AudioSystem.DEVICE_NONE)
&& (mDeviceSystemType != AudioSystem.DEVICE_OUT_REMOTE_SUBMIX)
&& (mDeviceSystemType != AudioSystem.DEVICE_IN_REMOTE_SUBMIX)) {
if ((mRouteFlags & ROUTE_FLAG_RENDER) == 0) {
throw new IllegalArgumentException(
"Can't have audio device without flag ROUTE_FLAG_RENDER");
@@ -357,8 +358,17 @@ public class AudioMix {
throw new IllegalArgumentException(
"Can't have flag ROUTE_FLAG_RENDER without an audio device");
}
if ((mRouteFlags & ROUTE_FLAG_SUPPORTED) == ROUTE_FLAG_LOOP_BACK) {
if (mRule.getTargetMixType() == MIX_TYPE_PLAYERS) {
mDeviceSystemType = AudioSystem.DEVICE_OUT_REMOTE_SUBMIX;
} else if (mRule.getTargetMixType() == MIX_TYPE_RECORDERS) {
mDeviceSystemType = AudioSystem.DEVICE_IN_REMOTE_SUBMIX;
} else {
throw new IllegalArgumentException("Unknown mixing rule type");
}
}
}
return new AudioMix(mRule, mFormat, mRouteFlags, mCallbackFlags, mDeviceId,
return new AudioMix(mRule, mFormat, mRouteFlags, mCallbackFlags, mDeviceSystemType,
mDeviceAddress);
}
}

2
media/java/android/media/audiopolicy/AudioPolicyConfig.java
View File

@@ -84,7 +84,7 @@ public class AudioPolicyConfig implements Parcelable {
// write callback flags
dest.writeInt(mix.mCallbackFlags);
// write device information
dest.writeInt(mix.mDeviceId);
dest.writeInt(mix.mDeviceSystemType);
dest.writeString(mix.mDeviceAddress);
// write mix format
dest.writeInt(mix.getFormat().getSampleRate());