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

Fsk demodulator improvements

aprs
sh123 2022-08-12 00:13:05 +03:00
rodzic afe44a6889
commit 7bbca6a7a2
1 zmienionych plików z 10 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
codec2talkie/src/main/java/com/radio/codec2talkie/transport/SoundModemFsk.java
Wyświetl plik

@ -20,6 +20,7 @@ import com.ustadmobile.codec2.Codec2;
import java.io.IOException; import java.io.IOException;
import java.nio.BufferOverflowException; import java.nio.BufferOverflowException;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ShortBuffer; import java.nio.ShortBuffer;
import java.util.Arrays; import java.util.Arrays;
@ -83,7 +84,7 @@ public class SoundModemFsk implements Transport, Runnable {
if (bitRate == 300) { if (bitRate == 300) {
// <230 spacing for 300 bps does not work with codec2 fsk for receive // <230 spacing for 300 bps does not work with codec2 fsk for receive
_fskModem = Codec2.fskCreate(SAMPLE_RATE, 300, 1600, 200, gain); _fskModem = Codec2.fskCreate(SAMPLE_RATE, 300, 1600, 200, gain);
} else { } else {
_fskModem = Codec2.fskCreate(SAMPLE_RATE, 1200, 1200, 1000, gain); _fskModem = Codec2.fskCreate(SAMPLE_RATE, 1200, 1200, 1000, gain);
} }
@ -97,7 +98,7 @@ public class SoundModemFsk implements Transport, Runnable {
constructSystemAudioDevices(disableRx); constructSystemAudioDevices(disableRx);
_sampleBuffer = ByteBuffer.allocate(_isLoopback ? 1024 * 100 : 0); _sampleBuffer = ByteBuffer.allocate(_isLoopback ? 1024 * 100 : 0);
_recordAudioSampleBuffer = ShortBuffer.allocate(_isLoopback ? 1024*100 : 1024*10); _recordAudioSampleBuffer = ShortBuffer.allocate(_isLoopback ? 1024*100 : 1024*100);
_rigCtl = RigCtlFactory.create(context); _rigCtl = RigCtlFactory.create(context);
try { try {
@ -161,7 +162,13 @@ public class SoundModemFsk implements Transport, Runnable {
// read samples to record audio buffer if there is enough data // read samples to record audio buffer if there is enough data
if (_recordAudioSampleBuffer.position() >= nin) { if (_recordAudioSampleBuffer.position() >= nin) {
_recordAudioSampleBuffer.flip(); _recordAudioSampleBuffer.flip();
_recordAudioSampleBuffer.get(_recordAudioBuffer, 0, nin); try {
_recordAudioSampleBuffer.get(_recordAudioBuffer, 0, nin);
} catch (BufferUnderflowException e) {
e.printStackTrace();
_recordAudioSampleBuffer.clear();
return 0;
}
_recordAudioSampleBuffer.compact(); _recordAudioSampleBuffer.compact();
//Log.i(TAG, "read " + _recordAudioBuffer.position() + " " +audioSamples.length + " " + DebugTools.shortsToHex(audioSamples)); //Log.i(TAG, "read " + _recordAudioBuffer.position() + " " +audioSamples.length + " " + DebugTools.shortsToHex(audioSamples));
// otherwise return void to the user // otherwise return void to the user