Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed audio route issues

Browse source
This commit is contained in:
Sylvain Berfini 2021-03-24 13:54:33 +01:00
parent f5c2be45c0
commit b6445cda7f
1 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
app/src/main/java/org/linphone/call/AndroidAudioManager.java
View file

@ -36,12 +36,14 @@ public class AndroidAudioManager {
private Context mContext; private Context mContext;
private AudioManager mAudioManager; private AudioManager mAudioManager;
private boolean mEchoTesterIsRunning = false; private boolean mEchoTesterIsRunning = false;
private boolean mPreviousStateIsConnected = false;
private CoreListenerStub mListener; private CoreListenerStub mListener;
public AndroidAudioManager(Context context) { public AndroidAudioManager(Context context) {
mContext = context; mContext = context;
mAudioManager = ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE)); mAudioManager = ((AudioManager) context.getSystemService(Context.AUDIO_SERVICE));
mPreviousStateIsConnected = false;
mListener = mListener =
new CoreListenerStub() { new CoreListenerStub() {
@ -63,11 +65,15 @@ public class AndroidAudioManager {
routeAudioToEarPiece(); routeAudioToEarPiece();
} }
} }
} else { }
}
} else if (state == Call.State.StreamsRunning
&& mPreviousStateIsConnected) {
if (isBluetoothHeadsetConnected()) {
routeAudioToBluetooth(); routeAudioToBluetooth();
} }
} }
} mPreviousStateIsConnected = state == Call.State.Connected;
} }
}; };
@ -95,11 +101,11 @@ public class AndroidAudioManager {
} }
public boolean isAudioRoutedToSpeaker() { public boolean isAudioRoutedToSpeaker() {
return mAudioManager.isSpeakerphoneOn() && !isUsingBluetoothAudioRoute(); return isUsingSpeakerAudioRoute() && !isUsingBluetoothAudioRoute();
} }
public boolean isAudioRoutedToEarpiece() { public boolean isAudioRoutedToEarpiece() {
return !mAudioManager.isSpeakerphoneOn() && !isUsingBluetoothAudioRoute(); return !isUsingSpeakerAudioRoute() && !isUsingBluetoothAudioRoute();
} }
/* Echo cancellation */ /* Echo cancellation */
@ -143,6 +149,21 @@ public class AndroidAudioManager {
return false; return false;
} }
public synchronized boolean isUsingSpeakerAudioRoute() {
if (LinphoneManager.getCore().getCallsNb() == 0) return false;
Call currentCall = LinphoneManager.getCore().getCurrentCall();
if (currentCall == null) currentCall = LinphoneManager.getCore().getCalls()[0];
if (currentCall == null) return false;
AudioDevice audioDevice = currentCall.getOutputAudioDevice();
if (audioDevice == null) return false;
Log.i(
"[Audio Manager] Currently used audio device: ",
audioDevice.getDeviceName(),
"/",
audioDevice.getType().name());
return audioDevice.getType() == AudioDevice.Type.Speaker;
}
private void routeAudioToSpeakerHelper(boolean speakerOn) { private void routeAudioToSpeakerHelper(boolean speakerOn) {
Log.w("[Audio Manager] Routing audio to " + (speakerOn ? "speaker" : "earpiece")); Log.w("[Audio Manager] Routing audio to " + (speakerOn ? "speaker" : "earpiece"));
@ -190,7 +211,11 @@ public class AndroidAudioManager {
if (currentCall == null) return false; if (currentCall == null) return false;
AudioDevice audioDevice = currentCall.getOutputAudioDevice(); AudioDevice audioDevice = currentCall.getOutputAudioDevice();
if (audioDevice == null) return false; if (audioDevice == null) return false;
Log.i("[Audio Manager] Currently used audio device: ", audioDevice.getDeviceName()); Log.i(
"[Audio Manager] Currently used audio device: ",
audioDevice.getDeviceName(),
"/",
audioDevice.getType().name());
return audioDevice.getType() == AudioDevice.Type.Bluetooth; return audioDevice.getType() == AudioDevice.Type.Bluetooth;
} }
@ -198,7 +223,11 @@ public class AndroidAudioManager {
for (AudioDevice audioDevice : LinphoneManager.getCore().getAudioDevices()) { for (AudioDevice audioDevice : LinphoneManager.getCore().getAudioDevices()) {
if (audioDevice.getType() == AudioDevice.Type.Bluetooth if (audioDevice.getType() == AudioDevice.Type.Bluetooth
&& audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) { && audioDevice.hasCapability(AudioDevice.Capabilities.CapabilityPlay)) {
Log.i("[Audio Manager] Found bluetooth device: ", audioDevice.getDeviceName()); Log.i(
"[Audio Manager] Found bluetooth device: ",
audioDevice.getDeviceName(),
"/",
audioDevice.getType().name());
return true; return true;
} }
} }
@ -207,12 +236,13 @@ public class AndroidAudioManager {
public synchronized boolean isWiredHeadsetAvailable() { public synchronized boolean isWiredHeadsetAvailable() {
for (AudioDevice audioDevice : LinphoneManager.getCore().getExtendedAudioDevices()) { for (AudioDevice audioDevice : LinphoneManager.getCore().getExtendedAudioDevices()) {
Log.e("# AUDIO DEVICE TYPE IS " + audioDevice.getType().name());
if (audioDevice.getType() == AudioDevice.Type.Headphones if (audioDevice.getType() == AudioDevice.Type.Headphones
|| audioDevice.getType() == AudioDevice.Type.Headset) { || audioDevice.getType() == AudioDevice.Type.Headset) {
Log.i( Log.i(
"[Audio Manager] Found headset/headphone device: ", "[Audio Manager] Found headset/headphone device: ",
audioDevice.getDeviceName()); audioDevice.getDeviceName(),
"/",
audioDevice.getType().name());
return true; return true;
} }
} }
@ -231,6 +261,8 @@ public class AndroidAudioManager {
Log.i( Log.i(
"[Audio Manager] Found bluetooth audio device", "[Audio Manager] Found bluetooth audio device",
audioDevice.getDeviceName(), audioDevice.getDeviceName(),
"/",
audioDevice.getType().name(),
", routing audio to it"); ", routing audio to it");
currentCall.setOutputAudioDevice(audioDevice); currentCall.setOutputAudioDevice(audioDevice);
return; return;