Skip to content

refactor microphonemanager #2132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pedroSG94 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor microphonemanager #2132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 37 additions & 27 deletions encoder/src/main/java/com/pedro/encoder/input/audio/MicrophoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,18 @@ public boolean createMicrophone(int audioSource, int sampleRate, boolean isStere
this.sampleRate = sampleRate;
channel = isStereo ? AudioFormat.CHANNEL_IN_STEREO : AudioFormat.CHANNEL_IN_MONO;
getPcmBufferSize(sampleRate, channel);
audioRecord = new AudioRecord(audioSource, sampleRate, channel, audioFormat, AudioEncoder.inputSize * 5);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
audioRecord = new AudioRecord.Builder()
.setAudioFormat(new AudioFormat.Builder().setEncoding(audioFormat)
.setSampleRate(sampleRate)
.setChannelMask(channel)
.build())
.setAudioSource(audioSource)
.setBufferSizeInBytes(AudioEncoder.inputSize * 5)
.build();
} else {
audioRecord = new AudioRecord(audioSource, sampleRate, channel, audioFormat, AudioEncoder.inputSize * 5);
}
audioPostProcessEffect = new AudioPostProcessEffect(audioRecord.getAudioSessionId());
if (echoCanceler) audioPostProcessEffect.enableEchoCanceler();
if (noiseSuppressor) audioPostProcessEffect.enableNoiseSuppressor();
Expand All @@ -119,7 +130,7 @@ public boolean createMicrophone(int audioSource, int sampleRate, boolean isStere
Log.i(TAG, "Microphone created, " + sampleRate + "hz, " + chl);
mode = Mode.MICROPHONE;
created = true;
} catch (IllegalArgumentException e) {
} catch (Exception e) {
Log.e(TAG, "create microphone error", e);
}
return created;
Expand All @@ -140,32 +151,31 @@ public boolean createMicrophone(int audioSource, int sampleRate, boolean isStere
public boolean createInternalMicrophone(AudioPlaybackCaptureConfiguration config, int sampleRate,
boolean isStereo, boolean echoCanceler, boolean noiseSuppressor) {
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
this.sampleRate = sampleRate;
channel = isStereo ? AudioFormat.CHANNEL_IN_STEREO : AudioFormat.CHANNEL_IN_MONO;
getPcmBufferSize(sampleRate, channel);
audioRecordDevice = new AudioRecord.Builder()
.setAudioPlaybackCaptureConfig(config)
.setAudioFormat(new AudioFormat.Builder().setEncoding(audioFormat)
.setSampleRate(sampleRate)
.setChannelMask(channel)
.build())
.setBufferSizeInBytes(AudioEncoder.inputSize * 5)
.build();
audioPostProcessEffectDevice = new AudioPostProcessEffect(audioRecordDevice.getAudioSessionId());
if (echoCanceler) audioPostProcessEffectDevice.enableEchoCanceler();
if (noiseSuppressor) audioPostProcessEffectDevice.enableNoiseSuppressor();
String chl = (isStereo) ? "Stereo" : "Mono";
if (audioRecordDevice.getState() != AudioRecord.STATE_INITIALIZED) {
throw new IllegalArgumentException("Some parameters specified are not valid");
}
Log.i(TAG, "Internal microphone created, " + sampleRate + "hz, " + chl);
mode = Mode.INTERNAL;
created = true;
} else {
return createMicrophone(sampleRate, isStereo, echoCanceler, noiseSuppressor);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q){
throw new IllegalStateException("Internal microphone unsupported in this Android version");
}
} catch (IllegalArgumentException e) {
this.sampleRate = sampleRate;
channel = isStereo ? AudioFormat.CHANNEL_IN_STEREO : AudioFormat.CHANNEL_IN_MONO;
getPcmBufferSize(sampleRate, channel);
audioRecordDevice = new AudioRecord.Builder()
.setAudioPlaybackCaptureConfig(config)
.setAudioFormat(new AudioFormat.Builder().setEncoding(audioFormat)
.setSampleRate(sampleRate)
.setChannelMask(channel)
.build())
.setBufferSizeInBytes(AudioEncoder.inputSize * 5)
.build();
audioPostProcessEffectDevice = new AudioPostProcessEffect(audioRecordDevice.getAudioSessionId());
if (echoCanceler) audioPostProcessEffectDevice.enableEchoCanceler();
if (noiseSuppressor) audioPostProcessEffectDevice.enableNoiseSuppressor();
String chl = (isStereo) ? "Stereo" : "Mono";
if (audioRecordDevice.getState() != AudioRecord.STATE_INITIALIZED) {
throw new IllegalArgumentException("Some parameters specified are not valid");
}
Log.i(TAG, "Internal microphone created, " + sampleRate + "hz, " + chl);
mode = Mode.INTERNAL;
created = true;
} catch (Exception e) {
Log.e(TAG, "create microphone error", e);
}
return created;
Expand Down
Loading