mirror
/
codec2_talkie
kopia lustrzana https://github.com/sh123/codec2_talkie
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Select built in mic and speaker for speech when sound modem is in use (uses external headset and mic)

legacy 1.34
sh123 2022-08-10 13:41:23 +03:00
rodzic ad5b2b12e8
commit 201e5ef8e0
1 zmienionych plików z 32 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

49
codec2talkie/src/main/java/com/radio/codec2talkie/app/AppWorker.java
Wyświetl plik

@ -10,6 +10,7 @@ import android.media.AudioManager;
import android.media.AudioRecord;
import android.media.AudioTrack;
import android.media.MediaRecorder;
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
@ -99,10 +100,10 @@ public class AppWorker extends Thread {
_processPeriodicTimer = new Timer();
_recordAudioBuffer = new short[_protocol.getPcmAudioBufferSize()];
constructSystemAudioDevices();
constructSystemAudioDevices(transportType);
}
private void constructSystemAudioDevices() {
private void constructSystemAudioDevices(TransportFactory.TransportType transportType) {
int _audioRecorderMinBufferSize = AudioRecord.getMinBufferSize(
AUDIO_SAMPLE_SIZE,
AudioFormat.CHANNEL_IN_MONO,
@ -119,15 +120,6 @@ public class AppWorker extends Thread {
AudioFormat.ENCODING_PCM_16BIT,
10 * _audioRecorderMinBufferSize);
/*
AudioManager audioManager = (AudioManager)_context.getSystemService(Context.AUDIO_SERVICE);
for (AudioDeviceInfo inputDevice : audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)) {
boolean isBuiltIn = inputDevice.getType() == AudioDeviceInfo.TYPE_BUILTIN_MIC;
Log.i(TAG, "input device: " + isBuiltIn + " " + inputDevice.getProductName());
if (isBuiltIn) _systemAudioRecorder.setPreferredDevice(inputDevice);
}
*/
int _audioPlayerMinBufferSize = AudioTrack.getMinBufferSize(
AUDIO_SAMPLE_SIZE,
AudioFormat.CHANNEL_OUT_MONO,
@ -152,13 +144,36 @@ public class AppWorker extends Thread {
.setBufferSizeInBytes(10 * _audioPlayerMinBufferSize)
.build();
/*
for (AudioDeviceInfo outputDevice : audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) {
boolean isBuiltIn = outputDevice.getType() == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER;
Log.i(TAG, "output device: " + isBuiltIn + " " + outputDevice.getProductName());
if (isBuiltIn) _systemAudioRecorder.setPreferredDevice(outputDevice);
// Use built in mic and speaker for speech when sound modem is in use
if (transportType == TransportFactory.TransportType.SOUND_MODEM) {
selectBuiltinMicAndSpeakerEarpiece(isSpeakerOutput);
}
}
private void selectBuiltinMicAndSpeakerEarpiece(boolean isSpeakerOutput) {
AudioManager audioManager = (AudioManager)_context.getSystemService(Context.AUDIO_SERVICE);
for (AudioDeviceInfo inputDevice : audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)) {
boolean isBuiltIn = inputDevice.getType() == AudioDeviceInfo.TYPE_BUILTIN_MIC;
Log.i(TAG, "input device: " + isBuiltIn + " " + inputDevice.getProductName() + " " + inputDevice.getType());
if (isBuiltIn) {
boolean isSet = _systemAudioRecorder.setPreferredDevice(inputDevice);
if (!isSet)
Log.w(TAG, "cannot select input " + inputDevice.getProductName());
break;
}
}
for (AudioDeviceInfo outputDevice : audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) {
boolean isBuiltIn = outputDevice.getType() == (isSpeakerOutput ? AudioDeviceInfo.TYPE_BUILTIN_SPEAKER : AudioDeviceInfo.TYPE_BUILTIN_EARPIECE);
Log.i(TAG, "output device: " + isBuiltIn + " " + outputDevice.getProductName() + " " + outputDevice.getType());
if (isBuiltIn) {
boolean isSet = _systemAudioPlayer.setPreferredDevice(outputDevice);
if (!isSet)
Log.w(TAG, "cannot select output " + outputDevice.getProductName());
break;
}
}
*/
}
public static int getAudioMinLevel() {