VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-24 21:15:24 -04:00
Code Issues Projects Releases Wiki Activity

DATV Demod: leandvb: more debug messages. LOCK/UNLOCK message to console. Tolerate lower MER

Browse Source
This commit is contained in:
f4exb 2021-03-29 04:02:22 +02:00
parent 011d5fbf60
commit a066e4dbc1
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/channelrx/demoddatv/leansdr/dvbs2.h
View File

@ -615,6 +615,7 @@ struct s2_frame_receiver : runnable
pls_total_count(0), pls_total_count(0),
m_modcodType(-1), m_modcodType(-1),
m_modcodRate(-1), m_modcodRate(-1),
m_locked(false),
diffs(nullptr), diffs(nullptr),
sspilots(nullptr) sspilots(nullptr)
{ {
@ -817,6 +818,12 @@ struct s2_frame_receiver : runnable
fprintf(stderr, "PROBE\n"); fprintf(stderr, "PROBE\n");
} }
if (m_locked)
{
fprintf(stderr, "UNLOCKED\n");
m_locked = false;
}
state = FRAME_PROBE; state = FRAME_PROBE;
} }
@ -832,6 +839,12 @@ struct s2_frame_receiver : runnable
fprintf(stderr, "LOCKED\n"); fprintf(stderr, "LOCKED\n");
} }
if (!m_locked)
{
fprintf(stderr, "LOCKED\n");
m_locked = true;
}
opt_write(state_out, 1); opt_write(state_out, 1);
} }
@ -1037,11 +1050,11 @@ struct s2_frame_receiver : runnable
return; return;
} }
if (mer < mcinfo->esn0_nf - 1.0f) if (mer < mcinfo->esn0_nf - 3.0f) // was -1.0f
{ {
// False positive from PLHEADER detection. // False positive from PLHEADER detection.
if (sch->debug) { if (sch->debug) {
fprintf(stderr, "Insufficient MER (%f/%f)\n", mer, mcinfo->esn0_nf - 1.0f); fprintf(stderr, "Insufficient MER (%f/%f)\n", mer, mcinfo->esn0_nf - 3.0f);
} }
in.read(ss.p-in.rd()); in.read(ss.p-in.rd());
@ -1526,6 +1539,10 @@ struct s2_frame_receiver : runnable
int ns, int ns,
sampler_state *ss) sampler_state *ss)
{ {
if (sch->debug) {
fprintf(stderr, "match_freq\n");
}
complex<float> diff = 0; complex<float> diff = 0;
for (int i=0; i<ns-1; ++i) for (int i=0; i<ns-1; ++i)
@ -1635,6 +1652,10 @@ struct s2_frame_receiver : runnable
cstln_lut<SOFTSYMB,256> *dcstln cstln_lut<SOFTSYMB,256> *dcstln
) )
{ {
if (sch->debug) {
fprintf(stderr, "match_frame\n");
}
// With pilots: Use first block of data slots. // With pilots: Use first block of data slots.
// Without pilots: Use whole frame. // Without pilots: Use whole frame.
int ns = pls->pilots ? 16*90 : S*90; int ns = pls->pilots ? 16*90 : S*90;
@ -1647,17 +1668,17 @@ struct s2_frame_receiver : runnable
float besterr = 1e99; float besterr = 1e99;
float bestslip = 0; // Avoid compiler warning float bestslip = 0; // Avoid compiler warning
for (int slip=-sliprange; slip<=sliprange; ++slip) for (int slip = -sliprange; slip <= sliprange; ++slip)
{ {
sampler_state ssl = *pss; sampler_state ssl = *pss;
float dfw = slip * 65536.0f / nwrap; float dfw = slip * 65536.0f / nwrap;
ssl.fw16 += dfw; ssl.fw16 += dfw;
// Apply retroactively from midpoint of preceeding PLHEADER, // Apply retroactively from midpoint of preceeding PLHEADER,
// where the phase from match_ph_amp is most reliable. // where the phase from match_ph_amp is most reliable.
ssl.ph16 += dfw * (plscodes.LENGTH+sof.LENGTH)/2; ssl.ph16 += dfw * (plscodes.LENGTH + sof.LENGTH) / 2;
float err = 0; float err = 0;
for (int s=0; s<ns; ++s) for (int s = 0; s < ns; ++s)
{ {
complex<float> p = interp_next(&ssl) * ssl.gain; complex<float> p = interp_next(&ssl) * ssl.gain;
typename cstln_lut<SOFTSYMB,256>::result *cr = typename cstln_lut<SOFTSYMB,256>::result *cr =
@ -1671,8 +1692,8 @@ struct s2_frame_receiver : runnable
if (err < besterr) if (err < besterr)
{ {
besterr=err; besterr = err;
bestslip=slip; bestslip = slip;
} }
#if DEBUG_CARRIER #if DEBUG_CARRIER
fprintf(stderr, "slip %+3d %6.0f ppm err=%f\n", fprintf(stderr, "slip %+3d %6.0f ppm err=%f\n",
@ -1844,6 +1865,7 @@ struct s2_frame_receiver : runnable
uint32_t pls_total_errors, pls_total_count; uint32_t pls_total_errors, pls_total_count;
int m_modcodType; int m_modcodType;
int m_modcodRate; int m_modcodRate;
bool m_locked;
private: private:
complex<T> *diffs; complex<T> *diffs;

2
plugins/channelrx/demoddatv/leansdr/sdr.h
View File

@ -753,7 +753,7 @@ struct cstln_lut : cstln_base
// demodulation would probably fail anyway. // demodulation would probably fail anyway.
// //
// Comment-out for better throughput at high SNR. // Comment-out for better throughput at high SNR.
#if 1 #if 0
while (I < -128 || I > 127 || Q < -128 || Q > 127) while (I < -128 || I > 127 || Q < -128 || Q > 127)
{ {
I *= 0.5; I *= 0.5;