mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-13 17:27:21 -05:00
DMR Stereo TDMA
DMR Stereo TDMA --play voice in both TDMA slots with the -T option (dsd -fr -T) --Improved MS voice (mostly working) and data handling (hit or miss) --pretty pretty colors on the console log output --rate 3/4 data decoding partially working
This commit is contained in:
@@ -23,8 +23,19 @@ upsample (dsd_state * state, float invalue)
|
||||
|
||||
int i, j, sum;
|
||||
float *outbuf1, c, d;
|
||||
|
||||
outbuf1 = state->audio_out_float_buf_p;
|
||||
if (state->currentslot == 0 && state->dmr_stereo == 1)
|
||||
{
|
||||
outbuf1 = state->audio_out_float_buf_p;
|
||||
}
|
||||
if (state->currentslot == 1 && state->dmr_stereo == 1)
|
||||
{
|
||||
outbuf1 = state->audio_out_float_buf_pR;
|
||||
}
|
||||
if (state->dmr_stereo == 0)
|
||||
{
|
||||
outbuf1 = state->audio_out_float_buf_p;
|
||||
}
|
||||
//outbuf1 = state->audio_out_float_buf_p;
|
||||
outbuf1--;
|
||||
c = *outbuf1;
|
||||
d = invalue;
|
||||
@@ -43,6 +54,33 @@ upsample (dsd_state * state, float invalue)
|
||||
*outbuf1 = d;
|
||||
outbuf1++;
|
||||
|
||||
if (state->currentslot == 1 && state->dmr_stereo == 1)
|
||||
{
|
||||
if (state->audio_out_idx2R > 24)
|
||||
{
|
||||
// smoothing
|
||||
outbuf1 -= 16;
|
||||
for (j = 0; j < 4; j++)
|
||||
{
|
||||
for (i = 0; i < 6; i++)
|
||||
{
|
||||
sum = 0;
|
||||
outbuf1 -= 2;
|
||||
sum += (int)*outbuf1;
|
||||
outbuf1 += 2;
|
||||
sum += (int)*outbuf1;
|
||||
outbuf1 += 2;
|
||||
sum += (int)*outbuf1;
|
||||
outbuf1 -= 2;
|
||||
*outbuf1 = (sum / (float) 3);
|
||||
outbuf1++;
|
||||
}
|
||||
outbuf1 -= 8;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (state->currentslot == 0 && state->dmr_stereo == 1)
|
||||
{
|
||||
if (state->audio_out_idx2 > 24)
|
||||
{
|
||||
// smoothing
|
||||
@@ -65,4 +103,30 @@ upsample (dsd_state * state, float invalue)
|
||||
outbuf1 -= 8;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (state->dmr_stereo == 0)
|
||||
{
|
||||
if (state->audio_out_idx2 > 24)
|
||||
{
|
||||
// smoothing
|
||||
outbuf1 -= 16;
|
||||
for (j = 0; j < 4; j++)
|
||||
{
|
||||
for (i = 0; i < 6; i++)
|
||||
{
|
||||
sum = 0;
|
||||
outbuf1 -= 2;
|
||||
sum += (int)*outbuf1;
|
||||
outbuf1 += 2;
|
||||
sum += (int)*outbuf1;
|
||||
outbuf1 += 2;
|
||||
sum += (int)*outbuf1;
|
||||
outbuf1 -= 2;
|
||||
*outbuf1 = (sum / (float) 3);
|
||||
outbuf1++;
|
||||
}
|
||||
outbuf1 -= 8;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user