n5ac/smartsdr-dsp
1
0
Fork 0
mirror of https://github.com/n5ac/smartsdr-dsp.git synced 2025-12-06 03:01:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Add reliable_sync_bit to FreeDV structure and handle audio passthrough in sched_waveform"

Browse source 
This reverts commit a14898a070.
This commit is contained in:
Ed Gonzalez 2015-02-05 11:29:02 -06:00
parent a14898a070
commit d2b0fc27a3
3 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DSP_API/CODEC2_FREEDV/freedv_api.c
View file

@ -303,7 +303,7 @@ int freedv_rx(struct freedv *f, short speech_out[], short demod_in[]) {
nin_prev = f->nin;
fdmdv_demod(f->fdmdv, f->fdmdv_bits, &reliable_sync_bit, rx_fdm, &f->nin);
fdmdv_get_demod_stats(f->fdmdv, &f->fdmdv_stats);
f->reliable_sync_bit = reliable_sync_bit;
if (f->fdmdv_stats.sync) {
if (reliable_sync_bit == 0) {
memcpy(f->rx_bits, f->fdmdv_bits, bits_per_fdmdv_frame*sizeof(int));

2
DSP_API/CODEC2_FREEDV/freedv_api.h
View file

@ -65,8 +65,6 @@ struct freedv {
void *callback_state;
int reliable_sync_bit;
};
struct freedv *freedv_open(int mode);

21
DSP_API/SmartSDR_Interface/sched_waveform.c
View file

@ -263,7 +263,7 @@ static void* _sched_waveform_thread(void* param)
int i; // for loop counter
float fsample; // a float sample
float Sig2Noise; // Signal to noise ratio
// float Sig2Noise; // Signal to noise ratio
// Flags ...
int initial_tx = 1; // Flags for TX circular buffer, clear if starting transmit
@ -457,18 +457,13 @@ static void* _sched_waveform_thread(void* param)
nout = freedv_rx(_freedvS, speech_out, demod_in);
// if(nout != 320 ) {
// output("NOUT not 320 it is %d\nNIN was %d\n", nout, nin);
// }
if ( nout == nin && _freedvS->reliable_sync_bit ){
for( i=0 ; i < nout ; i++)
{
cbWriteShort(RX3_cb, speech_out[i]);
}
} else {
for ( i = 0; i < nin ; i ++ ) {
cbWriteShort(RX3_cb, demod_in[i]);
}
for( i=0 ; i < nout ; i++)
{
cbWriteShort(RX3_cb, speech_out[i]);
}
}
// } else {
@ -492,7 +487,7 @@ static void* _sched_waveform_thread(void* param)
{
cbWriteFloat(RX4_cb, float_out_24k[i]);
}
Sig2Noise = (_freedvS->fdmdv_stats.snr_est);
//Sig2Noise = (_freedvS->fdmdv_stats.snr_est);
}
// Check for >= 128 samples in RX4_cb. Form packet and