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

Logging

legacy
sh123 2022-07-30 13:55:18 +03:00
rodzic f59f1ce749
commit 160f2596fa
2 zmienionych plików z 11 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
codec2talkie/src/main/java/com/radio/codec2talkie/protocol/aprs/tools/AprsSymbolTable.java
Wyświetl plik

@ -75,7 +75,7 @@ public class AprsSymbolTable {
}
public Bitmap bitmapFromSymbol(String symbolCode, boolean useLarge) {
if (symbolCode.length() != 2) return null;
if (symbolCode == null || symbolCode.length() != 2) return null;
ArrayList<Bitmap> _primaryTable = useLarge ? _primaryTableIconsLarge : _primaryTableIcons;
ArrayList<Bitmap> _secondaryTable = useLarge ? _secondaryTableIconsLarge : _secondaryTableIcons;

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

@ -79,7 +79,7 @@ public class SoundModem implements Transport {
_systemAudioPlayer = new AudioTrack.Builder()
.setAudioAttributes(new AudioAttributes.Builder()
.setUsage(usage)
.setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build())
.setAudioFormat(new AudioFormat.Builder()
.setEncoding(AudioFormat.ENCODING_PCM_16BIT)
@ -89,6 +89,7 @@ public class SoundModem implements Transport {
.setTransferMode(AudioTrack.MODE_STREAM)
.setBufferSizeInBytes(audioPlayerMinBufferSize)
.build();
_systemAudioPlayer.setVolume(AudioTrack.getMaxVolume());
}
@Override
@ -185,7 +186,14 @@ public class SoundModem implements Transport {
if (j >= _playbackBitBuffer.length) {
Log.i(TAG, "-- " + i + " " + j);
Codec2.fskModulate(_fskModem, _playbackAudioBuffer, _playbackBitBuffer);
_systemAudioPlayer.write(_playbackAudioBuffer, 0, _playbackAudioBuffer.length);
StringBuilder s = new StringBuilder();
for (int x = 0; x < _playbackAudioBuffer.length; x++) {
s.append(_playbackAudioBuffer[x]);
s.append(' ');
}
Log.i(TAG, s.toString());
int r = _systemAudioPlayer.write(_playbackAudioBuffer, 0, _playbackAudioBuffer.length);
Log.i(TAG, "---- result " + r);
_systemAudioPlayer.play();
j = 0;
}
@ -195,7 +203,6 @@ public class SoundModem implements Transport {
Codec2.fskModulate(_fskModem, _playbackAudioBuffer, Arrays.copyOf(_playbackBitBuffer, j));
_systemAudioPlayer.write(_playbackAudioBuffer, 0, _playbackAudioBuffer.length);
_systemAudioPlayer.play();
return 0;
}