kopia lustrzana https://github.com/sh123/codec2_talkie
Fix memory corruption
rodzic
89a9920373
commit
a98c35e2ca
|
@ -111,16 +111,14 @@ public class SoundModem implements Transport {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int write(byte[] srcDataBytesAsBits) throws IOException {
|
public int write(byte[] srcDataBytesAsBits) throws IOException {
|
||||||
//Log.i(TAG, DebugTools.byteBitsToString(srcDataBytesAsBits));
|
Log.i(TAG, DebugTools.byteBitsToString(srcDataBytesAsBits));
|
||||||
byte[] dataBytesAsBits = BitTools.convertToNRZI(srcDataBytesAsBits);
|
byte[] dataBytesAsBits = BitTools.convertToNRZI(srcDataBytesAsBits);
|
||||||
//Log.i(TAG, DebugTools.byteBitsToString(dataBytesAsBits));
|
Log.i(TAG, DebugTools.byteBitsToString(dataBytesAsBits));
|
||||||
|
|
||||||
int j = 0;
|
int j = 0;
|
||||||
for (int i = 0; i < dataBytesAsBits.length; i++, j++) {
|
for (int i = 0; i < dataBytesAsBits.length; i++, j++) {
|
||||||
if (j >= _playbackBitBuffer.length) {
|
if (j >= _playbackBitBuffer.length) {
|
||||||
//Log.i(TAG, DebugTools.byteBitsToString(_playbackBitBuffer));
|
|
||||||
Codec2.fskModulate(_fskModem, _playbackAudioBuffer, _playbackBitBuffer);
|
Codec2.fskModulate(_fskModem, _playbackAudioBuffer, _playbackBitBuffer);
|
||||||
//Log.i(TAG, DebugTools.shortsToHex(_playbackAudioBuffer));
|
|
||||||
_systemAudioPlayer.write(_playbackAudioBuffer, 0, _playbackAudioBuffer.length);
|
_systemAudioPlayer.write(_playbackAudioBuffer, 0, _playbackAudioBuffer.length);
|
||||||
_systemAudioPlayer.play();
|
_systemAudioPlayer.play();
|
||||||
j = 0;
|
j = 0;
|
||||||
|
|
|
@ -67,7 +67,7 @@ namespace Java_com_ustadmobile_codec2_Codec2 {
|
||||||
conFsk->N = fsk->N;
|
conFsk->N = fsk->N;
|
||||||
conFsk->Ts = fsk->Ts;
|
conFsk->Ts = fsk->Ts;
|
||||||
|
|
||||||
conFsk->modBuf = (float*)malloc(conFsk->N);
|
conFsk->modBuf = (float*)malloc(sizeof(float) * conFsk->N);
|
||||||
conFsk->modBits = (uint8_t*)malloc(conFsk->Nbits);
|
conFsk->modBits = (uint8_t*)malloc(conFsk->Nbits);
|
||||||
|
|
||||||
conFsk->demodCBuf = (COMP*)malloc(sizeof(COMP) * (fsk->N + 2 * fsk->Ts));
|
conFsk->demodCBuf = (COMP*)malloc(sizeof(COMP) * (fsk->N + 2 * fsk->Ts));
|
||||||
|
|
Ładowanie…
Reference in New Issue